fixes

Author: Nyholm

src/DependencyInjection/Compiler/DataCollectorCompilerPass.php

@@ -27,24 +27,9 @@ class DataCollectorCompilerPass extends BaseCompilerPass
      */
     protected function prepare()
     {
-        $this->transformLoggableCachePools();
-
         $collectorDefinition = $this->container->getDefinition('data_collector.cache');
-
         $serviceIds = $this->container->findTaggedServiceIds('cache.provider');
-        foreach (array_keys($serviceIds) as $id) {
-            $collectorDefinition->addMethodCall('addInstance', [$id, new Reference($id)]);
-        }
-
-        $this->container->setDefinition('data_collector.cache', $collectorDefinition);
-    }
 
-    /**
-     * Make all cache providers loggable.
-     */
-    private function transformLoggableCachePools()
-    {
-        $serviceIds = $this->container->findTaggedServiceIds('cache.provider');
         foreach (array_keys($serviceIds) as $id) {
 
             // Duplicating definition to $originalServiceId.logged
@@ -56,6 +41,7 @@ private function transformLoggableCachePools()
 
             // Overwrite the original service id with the new LoggingCachePool instance
             $this->container->setAlias($id, $id.'.logger');
+            $collectorDefinition->addMethodCall('addInstance', [$id, new Reference($id.'.logger')]);
         }
     }
 }

src/Routing/Matcher/CacheUrlMatcher.php

@@ -63,14 +63,15 @@ public function match($pathInfo)
         $method = strtolower($this->context->getMethod());
         $key    = 'route_'.$method.'_'.$host.'_'.$pathInfo;
 
-        if ($this->cachePool->hasItem($key)) {
-            return $this->cachePool->getItem($key)->get();
+        $cacheItem = $this->cachePool->getItem($key);
+        if ($cacheItem->isHit()) {
+            return $cacheItem->get();
         }
 
         $match = parent::match($pathInfo);
-        $item  = $this->cachePool->getItem($key);
-        $item->set($match)
+        $cacheItem->set($match)
             ->expiresAfter($this->ttl);
+        $this->cachePool->save($cacheItem);
 
         return $match;
     }