diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
index 07453181a886d957b48bbb6264880b7e33848193..34b74e4493b8041cb92ea67a0c728a9ace9d87a7 100644
--- a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
@@ -98,7 +98,18 @@ class UpgradeCommand extends AbstractSetupCommand
             $output->writeln('<info>Please re-run Magento compile command</info>');
         }
 
-        //TODO: to be removed in scope of MAGETWO-53476
+        return $this->doSomething($objectManager);
+    }
+
+    /**
+     * Enables cache if cachestates exists
+     * TODO: to be removed in scope of MAGETWO-53476
+     *
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @return int
+     */
+    private function doSomething($objectManager)
+    {
         $writeFactory = $objectManager->get('Magento\Framework\Filesystem\Directory\WriteFactory');
         $write = $writeFactory->create(BP);
         /** @var \Magento\Framework\App\Filesystem\DirectoryList $dirList */