MAGETWO-53056: Category tree is not refreshed after changing category URL suffix

Author: rganin

app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php

@@ -94,7 +94,10 @@ public function afterSave()
         if ($this->isValueChanged()) {
             $this->updateSuffixForUrlRewrites();
             if ($this->isCategorySuffixChanged()) {
-                $this->invalidateCategoryRelatedCache();
+                $this->cacheTypeList->invalidate([
+                    \Magento\Framework\App\Cache\Type\Block::TYPE_IDENTIFIER,
+                    \Magento\Framework\App\Cache\Type\Collection::TYPE_IDENTIFIER
+                ]);
             }
         }
         return parent::afterSave();
@@ -105,25 +108,12 @@ public function afterSave()
      *
      * @return bool
      */
-    protected function isCategorySuffixChanged()
+    private function isCategorySuffixChanged()
     {
-        return  $this->isValueChanged() 
+        return  $this->isValueChanged()
             && ($this->getPath() == CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX);
     }
 
-    /**
-     * Invalidate cache that store old category suffix
-     *
-     * @return void
-     */
-    protected function invalidateCategoryRelatedCache()
-    {
-        $this->cacheTypeList->invalidate([
-            \Magento\Framework\App\Cache\Type\Block::TYPE_IDENTIFIER,
-            \Magento\Framework\App\Cache\Type\Collection::TYPE_IDENTIFIER
-        ]);
-    }
-
     /**
      * Update suffix for url rewrites
      *