MAGETWO-52836: Enable EAV attributes caching

Author: akaplya

app/code/Magento/Eav/Model/Entity/Attribute.php

@@ -37,11 +37,6 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
      */
     protected $_eventPrefix = 'eav_entity_attribute';
 
-    /**
-     * @var AttributeCache
-     */
-    private $attributeCache;
-
     /**
      * Parameter name in event
      *
@@ -227,7 +222,7 @@ public function loadEntityAttributeIdBySet()
     public function beforeSave()
     {
         // prevent overriding product data
-        if (isset($this->_data['attribute_code']) && $this->getReservedAttributeList()->isReservedAttribute($this)) {
+        if (isset($this->_data['attribute_code']) && $this->reservedAttributeList->isReservedAttribute($this)) {
             throw new LocalizedException(
                 __(
                     'The attribute code \'%1\' is reserved by system. Please try another attribute code',
@@ -304,32 +299,9 @@ public function beforeSave()
     public function afterSave()
     {
         $this->_getResource()->saveInSetIncluding($this);
-        $this->getAttributeCache()->clear();
         return parent::afterSave();
     }
 
-    /**
-     * @return $this
-     */
-    public function afterDelete()
-    {
-        $this->getAttributeCache()->clear();
-        return parent::afterDelete();
-    }
-
-    /**
-     * Attribute cache
-     *
-     * @return AttributeCache
-     */
-    private function getAttributeCache()
-    {
-        if (!$this->attributeCache) {
-            $this->attributeCache = ObjectManager::getInstance()->get(AttributeCache::class);
-        }
-        return $this->attributeCache;
-    }
-
     /**
      * Detect backend storage type using frontend input type
      *
@@ -512,22 +484,8 @@ public function __wakeup()
         parent::__wakeup();
         $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
         $this->_localeDate = $objectManager->get(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class);
-        $this->_localeResolver = $objectManager->get(\Magento\Catalog\Model\Product\ReservedAttributeList::class);
-        $this->reservedAttributeList = $objectManager->get(\Magento\Framework\Locale\ResolverInterface::class);
+        $this->_localeResolver = $objectManager->get(\Magento\Framework\Locale\ResolverInterface::class);
+        $this->reservedAttributeList = $objectManager->get(\Magento\Catalog\Model\Product\ReservedAttributeList::class);
         $this->dateTimeFormatter = $objectManager->get(DateTimeFormatterInterface::class);
     }
-
-    /**
-     * @return \Magento\Catalog\Model\Product\ReservedAttributeList|mixed
-     */
-    private function getReservedAttributeList()
-    {
-        if ($this->reservedAttributeList) {
-            $this->reservedAttributeList = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                \Magento\Catalog\Model\Product\ReservedAttributeList::class
-            );
-        }
-
-        return $this->reservedAttributeList;
-    }
 }

app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php

@@ -215,6 +215,19 @@ protected function _afterSave(AbstractModel $object)
         return parent::_afterSave($object);
     }
 
+    /**
+     * Perform actions after object delete
+     *
+     * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    protected function _afterDelete(\Magento\Framework\Model\AbstractModel $object)
+    {
+        $this->getConfig()->clear();
+        $this->getAttributeCache()->clear();
+        return $this;
+    }
     /**
      * @return AttributeCache
      * @deprecated