symfony
diff --git a/‎src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+5-4 b/‎src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php
+5-4
diff --git a/‎src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
+10-8 b/‎src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
+10-8
@@ -157,7 +157,7 @@ public function invalidateTags(array $tags)
      */
     public function hasItem($key)
     {
-        if ($this->deferred) {
             $this->commit();
         }
         if (!$this->pool->hasItem($key)) {
@@ -200,9 +200,6 @@ public function getItem($key)
      */
     public function getItems(array $keys = [])
     {
-        if ($this->deferred) {
-            $this->commit();
-        }
         $tagKeys = [];
 
         foreach ($keys as $key) {
@@ -212,6 +209,10 @@ public function getItems(array $keys = [])
             }
         }
 
+        if ($this->deferred && (count($tagKeys) !== count($keys) || array_intersect_key($this->deferred, array_flip($keys)))) {
+            $this->commit();
+        }
+
         try {
             $items = $this->pool->getItems($tagKeys + $keys);
         } catch (InvalidArgumentException $e) {
 
@@ -208,10 +208,11 @@ public function deleteItems(array $keys)
      */
     public function getItem($key)
     {
-        if ($this->deferred) {
+        $id = $this->getId($key);
+
+        if (isset($this->deferred[$key])) {
             $this->commit();
         }
-        $id = $this->getId($key);
 
         $isHit = false;
         $value = null;
@@ -234,21 +235,22 @@ public function getItem($key)
      */
     public function getItems(array $keys = [])
     {
-        if ($this->deferred) {
-            $this->commit();
-        }
         $ids = [];
-
         foreach ($keys as $key) {
-            $ids[] = $this->getId($key);
+            $ids[$key] = $this->getId($key);
         }
+
+        if ($this->deferred && array_intersect_key($this->deferred, $ids)) {
+            $this->commit();
+        }
+
         try {
             $items = $this->doFetch($ids);
         } catch (\Exception $e) {
             CacheItem::log($this->logger, 'Failed to fetch items: '.$e->getMessage(), ['keys' => $keys, 'exception' => $e, 'cache-adapter' => get_debug_type($this)]);
             $items = [];
         }
-        $ids = array_combine($ids, $keys);
+        $ids = array_flip($ids);
 
         return $this->generateItems($items, $ids);
     }
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public function invalidateTags(array $tags)`
`157`	`157`	`*/`
`158`	`158`	`public function hasItem($key)`
`159`	`159`	`{`
`160`		`- if ($this->deferred) {`
	`160`	`+ if (isset($this->deferred[$key])) {`
`161`	`161`	`$this->commit();`
`162`	`162`	`}`
`163`	`163`	`if (!$this->pool->hasItem($key)) {`
`@@ -200,9 +200,6 @@ public function getItem($key)`
`200`	`200`	`*/`
`201`	`201`	`public function getItems(array $keys = [])`
`202`	`202`	`{`
`203`		`- if ($this->deferred) {`
`204`		`- $this->commit();`
`205`		`- }`
`206`	`203`	`$tagKeys = [];`
`207`	`204`
`208`	`205`	`foreach ($keys as $key) {`
`@@ -212,6 +209,10 @@ public function getItems(array $keys = [])`
`212`	`209`	`}`
`213`	`210`	`}`
`214`	`211`
	`212`	`+ if ($this->deferred && (count($tagKeys) !== count($keys) \|\| array_intersect_key($this->deferred, array_flip($keys)))) {`
	`213`	`+ $this->commit();`
	`214`	`+ }`
	`215`	`+`
`215`	`216`	`try {`
`216`	`217`	`$items = $this->pool->getItems($tagKeys + $keys);`
`217`	`218`	`} catch (InvalidArgumentException $e) {`