MAGETWO-96463: Add caching to improve admin performance

- remove caching \Magento\Catalog\Model\Product\Attribute\Source\Layout

Author: melnikovi

app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php

@@ -5,11 +5,10 @@
  */
 namespace Magento\Catalog\Model\Product\Attribute\Source;
 
-use Magento\Framework\App\Cache\Type\Layout as LayoutCache;
-use Magento\Framework\App\ObjectManager;
-
 /**
  * Catalog product landing page attribute source
+ *
+ * @author     Magento Core Team <[email protected]>
  */
 class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
@@ -18,40 +17,22 @@ class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
      */
     protected $pageLayoutBuilder;
 
-    /**
-     * @var LayoutCache
-     */
-    private $layoutCache;
-
     /**
      * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
-     * @param LayoutCache|null $layoutCache
      */
-    public function __construct(
-        \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder,
-        LayoutCache $layoutCache = null
-    ) {
+    public function __construct(\Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder)
+    {
         $this->pageLayoutBuilder = $pageLayoutBuilder;
-        $this->layoutCache = $layoutCache ?? ObjectManager::getInstance()->get(LayoutCache::class);
     }
 
     /**
-     * Get list of available layouts
-     *
      * @return array
      */
     public function getAllOptions()
     {
         if (!$this->_options) {
-            $layoutCacheKey = __CLASS__;
-            if ($data = $this->layoutCache->load($layoutCacheKey)) {
-                return $this->_options = unserialize($data);
-            } else {
-                $this->_options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
-                array_unshift($this->_options, ['value' => '', 'label' => __('No layout updates')]);
-                $this->layoutCache->save(serialize($this->_options), $layoutCacheKey);
-            }
-
+            $this->_options = $this->pageLayoutBuilder->getPageLayoutsConfig()->toOptionArray();
+            array_unshift($this->_options, ['value' => '', 'label' => __('No layout updates')]);
         }
         return $this->_options;
     }