diff --git a/dist/extensions/Echo/includes/SeenTime.php b/dist/extensions/Echo/includes/SeenTime.php
index e95e3ce54..5f8ee1cc1 100644
--- a/dist/extensions/Echo/includes/SeenTime.php
+++ b/dist/extensions/Echo/includes/SeenTime.php
@@ -56,7 +56,7 @@ private static function cache() {
 					'Either $wgEchoSeenTimeCacheType or $wgMainStash must be set'
 				);
 			}
-			return new CachedBagOStuff( $services->getObjectCacheFactory()->getInstance( $cacheConfig ) );
+			$wrappedCache = new CachedBagOStuff( $services->getObjectCacheFactory()->getInstance( $cacheConfig ) );
 		}
 
 		return $wrappedCache;
diff --git a/dist/vendor/composer/autoload_psr4.php b/dist/vendor/composer/autoload_psr4.php
index f6690ee52..9dfe004ed 100644
--- a/dist/vendor/composer/autoload_psr4.php
+++ b/dist/vendor/composer/autoload_psr4.php
@@ -32,8 +32,8 @@
     'Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'),
     'WMDE\\VueJsTemplating\\' => array($vendorDir . '/wmde/php-vuejs-templating/src'),
     'ValueValidators\\' => array($vendorDir . '/data-values/interfaces/src/ValueValidators'),
-    'ValueParsers\\' => array($vendorDir . '/data-values/interfaces/src/ValueParsers', $vendorDir . '/data-values/common/src/ValueParsers'),
-    'ValueFormatters\\' => array($vendorDir . '/data-values/interfaces/src/ValueFormatters', $vendorDir . '/data-values/common/src/ValueFormatters'),
+    'ValueParsers\\' => array($vendorDir . '/data-values/common/src/ValueParsers', $vendorDir . '/data-values/interfaces/src/ValueParsers'),
+    'ValueFormatters\\' => array($vendorDir . '/data-values/common/src/ValueFormatters', $vendorDir . '/data-values/interfaces/src/ValueFormatters'),
     'Symfony\\Polyfill\\Php83\\' => array($vendorDir . '/symfony/polyfill-php83'),
     'Symfony\\Polyfill\\Php82\\' => array($vendorDir . '/symfony/polyfill-php82'),
     'Symfony\\Polyfill\\Php73\\' => array($vendorDir . '/symfony/polyfill-php73'),
@@ -61,7 +61,7 @@
     'Mailgun\\' => array($vendorDir . '/mailgun/mailgun-php/src'),
     'LuceneExplain\\' => array($vendorDir . '/wikimedia/lucene-explain-parser/src'),
     'LightnCandy\\' => array($vendorDir . '/zordius/lightncandy/src'),
-    'League\\Uri\\' => array($vendorDir . '/league/uri-interfaces/src', $vendorDir . '/league/uri/src'),
+    'League\\Uri\\' => array($vendorDir . '/league/uri/src', $vendorDir . '/league/uri-interfaces/src'),
     'League\\OAuth2\\Server\\' => array($vendorDir . '/league/oauth2-server/src'),
     'League\\Event\\' => array($vendorDir . '/league/event/src'),
     'Lcobucci\\JWT\\' => array($vendorDir . '/lcobucci/jwt/src'),
@@ -89,7 +89,7 @@
     'DataValues\\Serializers\\' => array($vendorDir . '/data-values/serialization/src/Serializers'),
     'DataValues\\Geo\\' => array($vendorDir . '/data-values/geo/src'),
     'DataValues\\Deserializers\\' => array($vendorDir . '/data-values/serialization/src/Deserializers'),
-    'DataValues\\' => array($vendorDir . '/data-values/data-values/src', $vendorDir . '/data-values/common/src/DataValues'),
+    'DataValues\\' => array($vendorDir . '/data-values/common/src/DataValues', $vendorDir . '/data-values/data-values/src'),
     'Composer\\Semver\\' => array($vendorDir . '/composer/semver/src'),
     'Composer\\Installers\\' => array($vendorDir . '/composer/installers/src/Composer/Installers'),
     'Clue\\StreamFilter\\' => array($vendorDir . '/clue/stream-filter/src'),
diff --git a/dist/vendor/composer/autoload_static.php b/dist/vendor/composer/autoload_static.php
index 8c61d45c1..84f165d18 100644
--- a/dist/vendor/composer/autoload_static.php
+++ b/dist/vendor/composer/autoload_static.php
@@ -277,13 +277,13 @@ class ComposerStaticInite65dc3899ad3a63ed8a7260aa4f23630
         ),
         'ValueParsers\\' => 
         array (
-            0 => __DIR__ . '/..' . '/data-values/interfaces/src/ValueParsers',
-            1 => __DIR__ . '/..' . '/data-values/common/src/ValueParsers',
+            0 => __DIR__ . '/..' . '/data-values/common/src/ValueParsers',
+            1 => __DIR__ . '/..' . '/data-values/interfaces/src/ValueParsers',
         ),
         'ValueFormatters\\' => 
         array (
-            0 => __DIR__ . '/..' . '/data-values/interfaces/src/ValueFormatters',
-            1 => __DIR__ . '/..' . '/data-values/common/src/ValueFormatters',
+            0 => __DIR__ . '/..' . '/data-values/common/src/ValueFormatters',
+            1 => __DIR__ . '/..' . '/data-values/interfaces/src/ValueFormatters',
         ),
         'Symfony\\Polyfill\\Php83\\' => 
         array (
@@ -396,8 +396,8 @@ class ComposerStaticInite65dc3899ad3a63ed8a7260aa4f23630
         ),
         'League\\Uri\\' => 
         array (
-            0 => __DIR__ . '/..' . '/league/uri-interfaces/src',
-            1 => __DIR__ . '/..' . '/league/uri/src',
+            0 => __DIR__ . '/..' . '/league/uri/src',
+            1 => __DIR__ . '/..' . '/league/uri-interfaces/src',
         ),
         'League\\OAuth2\\Server\\' => 
         array (
@@ -509,8 +509,8 @@ class ComposerStaticInite65dc3899ad3a63ed8a7260aa4f23630
         ),
         'DataValues\\' => 
         array (
-            0 => __DIR__ . '/..' . '/data-values/data-values/src',
-            1 => __DIR__ . '/..' . '/data-values/common/src/DataValues',
+            0 => __DIR__ . '/..' . '/data-values/common/src/DataValues',
+            1 => __DIR__ . '/..' . '/data-values/data-values/src',
         ),
         'Composer\\Semver\\' => 
         array (
diff --git a/dist/vendor/composer/installed.php b/dist/vendor/composer/installed.php
index 4047df910..a64754ca9 100644
--- a/dist/vendor/composer/installed.php
+++ b/dist/vendor/composer/installed.php
@@ -248,8 +248,8 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../league/oauth2-server',
             'aliases' => array(
-                0 => '9.0.0',
-                1 => '9999999-dev',
+                0 => '9999999-dev',
+                1 => '9.0.0',
             ),
             'dev_requirement' => false,
         ),
diff --git a/pacman.yaml b/pacman.yaml
index 7244814a2..ddf54bd4f 100644
--- a/pacman.yaml
+++ b/pacman.yaml
@@ -756,6 +756,10 @@
     - .rubocop_todo.yml
     - Gruntfile.js
     - Doxyfile
+  patchUrls:
+    # This patch URL fixes SQLBagOStuff duplicate warnings due to bug in Echo extension.
+    # Remove when updated to 1.44+ (Bug: T412100).
+    - https://gerrit.wikimedia.org/r/changes/mediawiki%2Fextensions%2FEcho~1093496/revisions/1/patch?download
 - name: Poem
   artifactUrl: https://codeload.github.com/wikimedia/mediawiki-extensions-Poem/zip/7f17973c881e9d066e3ae584cb7415279964ee6a
   artifactLevel: 1