MAGETWO-52836: Enable EAV attributes caching

Author: akaplya

app/code/Magento/Customer/Model/Metadata/CachedMetadata.php

@@ -20,7 +20,7 @@ class CachedMetadata implements MetadataInterface
     /**
      * @var string
      */
-    protected $entityType = 'customer';
+    protected $entityType = 'none';
 
     /**
      * @var AttributeCache
@@ -79,7 +79,7 @@ public function getAllAttributesMetadata()
         if ($attributes !== false) {
             return $attributes;
         }
-        $attributes = $this->metadata->getCustomAttributesMetadata();
+        $attributes = $this->metadata->getAllAttributesMetadata();
         $this->getCache()->saveAttributes($this->entityType, $attributes, 'all');
         return $attributes;
     }

app/code/Magento/Customer/Model/Metadata/CustomerCachedMetadata.php

@@ -13,6 +13,8 @@
  */
 class CustomerCachedMetadata extends CachedMetadata implements CustomerMetadataInterface
 {
+    protected $entityType = 'customer';
+
     /**
      * Initialize dependencies.
      *

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

@@ -7,6 +7,7 @@
 
 use Magento\Eav\Model\Entity\Attribute as EntityAttribute;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Eav\Model\Entity\AttributeCache;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Eav\Model\Config;
@@ -41,6 +42,11 @@ class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     private $config;
 
+    /**
+     * @var AttributeCache
+     */
+    private $attributeCache;
+
     /**
      * Class constructor
      *
@@ -204,9 +210,21 @@ protected function _afterSave(AbstractModel $object)
             $object
         );
         $this->getConfig()->clear();
+        $this->getAttributeCache()->clear();
         return parent::_afterSave($object);
     }
 
+    /**
+     * @return AttributeCache
+     * @deprecated
+     */
+    private function getAttributeCache()
+    {
+        if (!$this->attributeCache) {
+            $this->attributeCache = ObjectManager::getInstance()->get(Config::class);
+        }
+        return $this->attributeCache;
+    }
     /**
      * @return Config
      * @deprecated