Merge remote-tracking branch 'remotes/github/MAGETWO-97311' into EPAM-PR-41

Author: VeronikaYarats

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

@@ -236,9 +236,8 @@ public function afterSave()
         ) {
             $this->_indexerEavProcessor->markIndexerAsInvalid();
         }
-        if ($this->_source !== null) {
-            $this->_source->clearOptions();
-        }
+        
+        $this->_source = null;
 
         return parent::afterSave();
     }

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

@@ -95,16 +95,6 @@ public function getOptionId($value)
         return null;
     }
 
-    /**
-     * Clear cached options.
-     *
-     * @return void
-     */
-    public function clearOptions() : void
-    {
-        $this->_options = null;
-    }
-
     /**
      * Add Value Sort To Collection Select
      *