ACPT-1572: Slow saving of stores/websites

Author: adifucan

app/code/Magento/Store/Model/Group.php

@@ -512,6 +512,16 @@ public function getIdentities()
         return [self::CACHE_TAG];
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getCacheTags()
+    {
+        $identities = $this->getIdentities();
+
+        return !empty($identities) ? $identities : parent::getCacheTags();
+    }
+
     /**
      * @inheritdoc
      */

app/code/Magento/Store/Model/Store.php

@@ -1365,6 +1365,16 @@ public function getIdentities()
         return [self::CACHE_TAG];
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getCacheTags()
+    {
+        $identities = $this->getIdentities();
+
+        return !empty($identities) ? $identities : parent::getCacheTags();
+    }
+
     /**
      * Return Store Path
      *

app/code/Magento/Store/Model/StoreManager.php

@@ -236,7 +236,10 @@ public function getWebsites($withDefault = false, $codeKey = false)
     public function reinitStores()
     {
         $this->currentStoreId = null;
-        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, [StoreResolver::CACHE_TAG, Store::CACHE_TAG]);
+        $this->cache->clean(
+            \Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG,
+            [StoreResolver::CACHE_TAG, Store::CACHE_TAG, Website::CACHE_TAG, Group::CACHE_TAG]
+        );
         $this->scopeConfig->clean();
         $this->storeRepository->clean();
         $this->websiteRepository->clean();

app/code/Magento/Store/Model/Website.php

@@ -687,6 +687,16 @@ public function getIdentities()
         return [self::CACHE_TAG];
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getCacheTags()
+    {
+        $identities = $this->getIdentities();
+
+        return !empty($identities) ? $identities : parent::getCacheTags();
+    }
+
     /**
      * @inheritdoc
      * @since 100.1.0

lib/internal/Magento/Framework/Model/AbstractModel.php

@@ -828,7 +828,7 @@ public function getCacheTags()
     public function cleanModelCache()
     {
         $tags = $this->getCacheTags();
-        if (!empty($tags)) {
+        if ($tags !== false) {
             $this->_cacheManager->clean($tags);
         }
         return $this;