Merge remote-tracking branch 'origin/3.19.x'

src/Config/WfdMetaConfigCache.php

@@ -73,18 +73,20 @@ public function isWfdMetaFresh(): bool
 
     public function write($content, array $metadata = null): void
     {
-        /** @var WfdMetaResource[] $wfdMetaResources */
+        $this->innerCache->write($content, $metadata);
+
+        // Create an extra cache layer by collecting all WfdMetaResources, fetching the current
+        // timestamp for the data they represent and put everything together into an extra
+        // `.wfd_meta` metadata file.
+
         $wfdMetaResources = [];
 
         foreach ($metadata as $key => $resource) {
             if ($resource instanceof WfdMetaResource) {
-                unset($metadata[$key]);
                 $wfdMetaResources[(string) $resource] = $resource; // use key to dedup resource
             }
         }
 
-        $this->innerCache->write($content, $metadata);
-
         $timestamp = null;
 
         if ($wfdMetaResources) {