MAGETWO-60890: Fatal error logging in as admin user with restricted role

Author: Sergii Kovalenko

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

@@ -15,11 +15,6 @@ class Store extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     protected $configCache;
 
-    /**
-     * @var array
-     */
-    private $storesCache;
-
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
@@ -167,15 +162,11 @@ protected function _changeGroup(\Magento\Framework\Model\AbstractModel $model)
      */
     public function readAllStores()
     {
-        if (!$this->storesCache) {
-            $select = $this->getConnection()
-                ->select()
-                ->from($this->getTable('store'));
-
-            $this->storesCache = $this->getConnection()->fetchAll($select);
-        }
+        $select = $this->getConnection()
+            ->select()
+            ->from($this->getTable('store'));
 
-        return $this->storesCache;
+        return $this->getConnection()->fetchAll($select);
     }
 
     /**

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

@@ -46,15 +46,11 @@ protected function _initUniqueFields()
      */
     public function readAllWebsites()
     {
-        if (!$this->websitesCache) {
-            $select = $this->getConnection()
-                ->select()
-                ->from($this->getTable('store_website'));
+        $select = $this->getConnection()
+            ->select()
+            ->from($this->getTable('store_website'));
 
-            $this->websitesCache = $this->getConnection()->fetchAll($select);
-        }
-
-        return $this->websitesCache;
+        return $this->getConnection()->fetchAll($select);
     }
 
     /**