diff --git a/app/code/Magento/PageCache/Api/VclGeneratorInterface.php b/app/code/Magento/PageCache/Api/VclGeneratorInterface.php
new file mode 100644
index 0000000000000..20c23bb784711
--- /dev/null
+++ b/app/code/Magento/PageCache/Api/VclGeneratorInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\PageCache\Api;
+
+/**
+ * @api
+ */
+interface VclGeneratorInterface
+{
+    /**
+     * Return generated varnish.vcl configuration file
+     *
+     * @param int $version
+     * @return string
+     */
+    public function generateVcl($version);
+}
\ No newline at end of file
diff --git a/app/code/Magento/PageCache/Api/VclTemplateLocatorInterface.php b/app/code/Magento/PageCache/Api/VclTemplateLocatorInterface.php
new file mode 100644
index 0000000000000..8750af418fc77
--- /dev/null
+++ b/app/code/Magento/PageCache/Api/VclTemplateLocatorInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\PageCache\Api;
+
+use Magento\PageCache\Exception\UnsupportedVarnishVersion;
+
+/**
+ * Vcl template locator interface
+ *
+ * @api
+ */
+interface VclTemplateLocatorInterface
+{
+    /**
+     * Get Varnish Vcl template
+     *
+     * @param int $version
+     * @return string
+     * @throws UnsupportedVarnishVersion
+     */
+    public function getTemplate($version);
+}
\ No newline at end of file
diff --git a/app/code/Magento/PageCache/Console/Command/GenerateVclCommand.php b/app/code/Magento/PageCache/Console/Command/GenerateVclCommand.php
new file mode 100644
index 0000000000000..cd5268056b43c
--- /dev/null
+++ b/app/code/Magento/PageCache/Console/Command/GenerateVclCommand.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\PageCache\Console\Command;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\Filesystem\DriverPool;
+use Magento\Framework\Filesystem\File\WriteFactory;
+use Magento\Framework\HTTP\PhpEnvironment\Request;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\PageCache\Api\VclGeneratorInterfaceFactory;
+use Magento\PageCache\Model\Config;
+use Magento\PageCache\Model\Varnish\VclTemplateLocator;
+use Magento\Store\Model\ScopeInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class GenerateVclCommand extends Command
+{
+    /**
+     * Access list option name
+     */
+    const ACCESS_LIST_OPTION = 'access-list';
+
+    /**
+     * Backend host option name
+     */
+    const BACKEND_HOST_OPTION = 'backend-host';
+
+    /**
+     * Backend port option name
+     */
+    const BACKEND_PORT_OPTION = 'backend-port';
+
+    /**
+     * Varnish version option name
+     */
+    const EXPORT_VERSION_OPTION = 'export-version';
+
+    /**
+     * Grace period option name
+     */
+    const GRACE_PERIOD_OPTION = 'grace-period';
+
+    /**
+     * Output file option name
+     */
+    const OUTPUT_FILE_OPTION = 'output-file';
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\WriteFactory
+     */
+    private $writeFactory;
+
+    /**
+     * @var VclGeneratorInterfaceFactory
+     */
+    private $vclGeneratorFactory;
+
+    /**
+     * @var array
+     */
+    private $inputToVclMap = [
+        self::ACCESS_LIST_OPTION => 'accessList',
+        self::BACKEND_PORT_OPTION => 'backendPort',
+        self::BACKEND_HOST_OPTION => 'backendHost',
+        self::GRACE_PERIOD_OPTION => 'gracePeriod',
+    ];
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var Json
+     */
+    private $serializer;
+
+    /**
+     * @inheritdoc
+     */
+    protected function configure()
+    {
+        $this->setName('varnish:vcl:generate')
+            ->setDescription('Generates Varnish VCL and echos it to the command line')
+            ->setDefinition($this->getOptionList());
+    }
+
+    /**
+     * @param VclGeneratorInterfaceFactory $vclGeneratorFactory
+     * @param WriteFactory $writeFactory
+     * @param ScopeConfigInterface $scopeConfig
+     * @param Json $serializer
+     */
+    public function __construct(
+        VclGeneratorInterfaceFactory $vclGeneratorFactory,
+        WriteFactory $writeFactory,
+        ScopeConfigInterface $scopeConfig,
+        Json $serializer
+    ) {
+        parent::__construct();
+        $this->writeFactory = $writeFactory;
+        $this->vclGeneratorFactory = $vclGeneratorFactory;
+        $this->scopeConfig = $scopeConfig;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $errors = $this->validate($input);
+        if ($errors) {
+            foreach ($errors as $error) {
+                $output->writeln('<error>'.$error.'</error>');
+
+                return Cli::RETURN_FAILURE;
+            }
+        }
+
+        try {
+            $outputFile = $input->getOption(self::OUTPUT_FILE_OPTION);
+            $varnishVersion = $input->getOption(self::EXPORT_VERSION_OPTION);
+            $vclParameters = array_merge($this->inputToVclParameters($input), [
+                'sslOffloadedHeader' => $this->getSslOffloadedHeader(),
+                'designExceptions' => $this->getDesignExceptions(),
+            ]);
+            $vclGenerator = $this->vclGeneratorFactory->create($vclParameters);
+            $vcl = $vclGenerator->generateVcl($varnishVersion);
+
+            if ($outputFile) {
+                $writer = $this->writeFactory->create($outputFile, DriverPool::FILE, 'w+');
+                $writer->write($vcl);
+                $writer->close();
+            } else {
+                $output->writeln($vcl);
+            }
+
+            return Cli::RETURN_SUCCESS;
+        } catch (\Exception $e) {
+            $output->writeln('<error>'.$e->getMessage().'</error>');
+            if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
+                $output->writeln($e->getTraceAsString());
+            }
+
+            return Cli::RETURN_FAILURE;
+        }
+    }
+
+    /**
+     * Get list of options for the command
+     *
+     * @return InputOption[]
+     */
+    private function getOptionList()
+    {
+        return [
+            new InputOption(
+                self::ACCESS_LIST_OPTION,
+                null,
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
+                'IPs access list that can purge Varnish',
+                ['localhost']
+            ),
+            new InputOption(
+                self::BACKEND_HOST_OPTION,
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Backend host for configuration',
+                'localhost'
+            ),
+            new InputOption(
+                self::BACKEND_PORT_OPTION,
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Backend post for configuration',
+                8080
+            ),
+            new InputOption(
+                self::EXPORT_VERSION_OPTION,
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Varnish configuration version to export',
+                VclTemplateLocator::VARNISH_SUPPORTED_VERSION_4
+            ),
+            new InputOption(
+                self::GRACE_PERIOD_OPTION,
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Grace period in seconds',
+                300
+            ),
+            new InputOption(
+                self::OUTPUT_FILE_OPTION,
+                null,
+                InputOption::VALUE_REQUIRED,
+                'Save output to target file'
+            ),
+        ];
+    }
+
+    /**
+     * @param InputInterface $input
+     * @return array
+     */
+    private function inputToVclParameters(InputInterface $input)
+    {
+        $parameters = [];
+
+        foreach ($this->inputToVclMap as $inputKey => $vclKey) {
+            $parameters[$vclKey] = $input->getOption($inputKey);
+        }
+
+        return $parameters;
+    }
+
+    /**
+     * Input validation
+     *
+     * @param InputInterface $input
+     * @return array
+     */
+    private function validate(InputInterface $input)
+    {
+        $errors = [];
+
+        if ($input->hasOption(self::BACKEND_PORT_OPTION)
+            && ($input->getOption(self::BACKEND_PORT_OPTION) < 0
+                || $input->getOption(self::BACKEND_PORT_OPTION) > 65535)
+        ) {
+            $errors[] = 'Invalid backend port value';
+        }
+
+        if ($input->hasOption(self::GRACE_PERIOD_OPTION)
+            && $input->getOption(self::GRACE_PERIOD_OPTION) < 0
+        ) {
+            $errors[] = 'Grace period can\'t be lower than 0';
+        }
+
+        return $errors;
+    }
+
+    /**
+     * Get ssl Offloaded header
+     *
+     * @return mixed
+     */
+    private function getSslOffloadedHeader()
+    {
+        return $this->scopeConfig->getValue(Request::XML_PATH_OFFLOADER_HEADER);
+    }
+
+    /**
+     * Get design exceptions
+     *
+     * @return array
+     */
+    private function getDesignExceptions()
+    {
+        $expressions = $this->scopeConfig->getValue(
+            Config::XML_VARNISH_PAGECACHE_DESIGN_THEME_REGEX,
+            ScopeInterface::SCOPE_STORE
+        );
+
+        return $expressions ? $this->serializer->unserialize($expressions) : [];
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/PageCache/Exception/UnsupportedVarnishVersion.php b/app/code/Magento/PageCache/Exception/UnsupportedVarnishVersion.php
new file mode 100644
index 0000000000000..19635671d2fea
--- /dev/null
+++ b/app/code/Magento/PageCache/Exception/UnsupportedVarnishVersion.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\PageCache\Exception;
+
+use Magento\Framework\Exception\LocalizedException;
+
+class UnsupportedVarnishVersion extends LocalizedException
+{
+
+}
\ No newline at end of file
diff --git a/app/code/Magento/PageCache/Model/Config.php b/app/code/Magento/PageCache/Model/Config.php
index bb9e7af1357ab..9b169acc3c911 100644
--- a/app/code/Magento/PageCache/Model/Config.php
+++ b/app/code/Magento/PageCache/Model/Config.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\Module\Dir;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\PageCache\Api\VclGeneratorInterfaceFactory;
 
 /**
  * Model is responsible for replacing default vcl template
@@ -81,12 +82,17 @@ class Config
      * @var Json
      */
     private $serializer;
+    /**
+     * @var VclGeneratorInterfaceFactory
+     */
+    private $vclGeneratorFactory;
 
     /**
      * @param Filesystem\Directory\ReadFactory $readFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\App\Cache\StateInterface $cacheState
      * @param Dir\Reader $reader
+     * @param VclGeneratorInterfaceFactory $vclGeneratorFactory
      * @param Json|null $serializer
      */
     public function __construct(
@@ -94,6 +100,7 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\App\Cache\StateInterface $cacheState,
         \Magento\Framework\Module\Dir\Reader $reader,
+        VclGeneratorInterfaceFactory $vclGeneratorFactory,
         Json $serializer = null
     ) {
         $this->readFactory = $readFactory;
@@ -101,6 +108,7 @@ public function __construct(
         $this->_cacheState = $cacheState;
         $this->reader = $reader;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+        $this->vclGeneratorFactory = $vclGeneratorFactory;
     }
 
     /**
@@ -130,16 +138,30 @@ public function getTtl()
      *
      * @param string $vclTemplatePath
      * @return string
+     * @deprecated
      * @api
      */
     public function getVclFile($vclTemplatePath)
     {
-        $moduleEtcPath = $this->reader->getModuleDir(Dir::MODULE_ETC_DIR, 'Magento_PageCache');
-        $configFilePath = $moduleEtcPath . '/' . $this->_scopeConfig->getValue($vclTemplatePath);
-        $directoryRead = $this->readFactory->create($moduleEtcPath);
-        $configFilePath = $directoryRead->getRelativePath($configFilePath);
-        $data = $directoryRead->readFile($configFilePath);
-        return strtr($data, $this->_getReplacements());
+        $accessList = $this->_scopeConfig->getValue(self::XML_VARNISH_PAGECACHE_ACCESS_LIST);
+        $designExceptions = $this->_scopeConfig->getValue(
+            self::XML_VARNISH_PAGECACHE_DESIGN_THEME_REGEX,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
+
+        $version = $vclTemplatePath === self::VARNISH_5_CONFIGURATION_PATH ? 5 : 4;
+        $sslOffloadedHeader = $this->_scopeConfig->getValue(
+            \Magento\Framework\HTTP\PhpEnvironment\Request::XML_PATH_OFFLOADER_HEADER
+        );
+        $vclGenerator = $this->vclGeneratorFactory->create([
+            'backendHost' => $this->_scopeConfig->getValue(self::XML_VARNISH_PAGECACHE_BACKEND_HOST),
+            'backendPort' => $this->_scopeConfig->getValue(self::XML_VARNISH_PAGECACHE_BACKEND_PORT),
+            'accessList' => $accessList ? explode(',',$accessList) : [],
+            'designExceptions' => $designExceptions ? $this->serializer->unserialize($designExceptions) : [],
+            'sslOffloadedHeader' => $sslOffloadedHeader,
+            'gracePeriod' => $this->_scopeConfig->getValue(self::XML_VARNISH_PAGECACHE_GRACE_PERIOD)
+        ]);
+        return $vclGenerator->generateVcl($version);
     }
 
     /**
diff --git a/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php b/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php
new file mode 100644
index 0000000000000..4e121107c444d
--- /dev/null
+++ b/app/code/Magento/PageCache/Model/Varnish/VclGenerator.php
@@ -0,0 +1,221 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\PageCache\Model\Varnish;
+
+use Magento\PageCache\Api\VclGeneratorInterface;
+use Magento\PageCache\Api\VclTemplateLocatorInterface;
+
+class VclGenerator implements VclGeneratorInterface
+{
+    /**
+     * @var string|null
+     */
+    private $backendHost;
+
+    /**
+     * @var int|null
+     */
+    private $backendPort;
+
+    /**
+     * @var array
+     */
+    private $accessList;
+
+    /**
+     * @var int|null
+     */
+    private $gracePeriod;
+
+    /**
+     * @var VclTemplateLocatorInterface
+     */
+    private $vclTemplateLocator;
+
+    /**
+     * @var string
+     */
+    private $sslOffloadedHeader;
+
+    /**
+     * @var array
+     */
+    private $designExceptions;
+
+    /**
+     * VclGenerator constructor.
+     *
+     * @param VclTemplateLocatorInterface $vclTemplateLocator
+     * @param string $backendHost
+     * @param int $backendPort
+     * @param array $accessList
+     * @param int $gracePeriod
+     * @param string $sslOffloadedHeader
+     * @param array $designExceptions
+     */
+    public function __construct(
+        VclTemplateLocatorInterface $vclTemplateLocator,
+        $backendHost,
+        $backendPort,
+        $accessList,
+        $gracePeriod,
+        $sslOffloadedHeader,
+        $designExceptions = []
+    ) {
+        $this->backendHost = $backendHost;
+        $this->backendPort = $backendPort;
+        $this->accessList = $accessList;
+        $this->gracePeriod = $gracePeriod;
+        $this->vclTemplateLocator = $vclTemplateLocator;
+        $this->sslOffloadedHeader = $sslOffloadedHeader;
+        $this->designExceptions = $designExceptions;
+    }
+
+    /**
+     * Return generated varnish.vcl configuration file
+     *
+     * @param int $version
+     * @return string
+     * @api
+     */
+    public function generateVcl($version)
+    {
+        $template = $this->vclTemplateLocator->getTemplate($version);
+        return strtr($template, $this->getReplacements());
+    }
+
+    /**
+     * Prepare data for VCL config
+     *
+     * @return array
+     */
+    private function getReplacements()
+    {
+        return [
+            '/* {{ host }} */' => $this->getBackendHost(),
+            '/* {{ port }} */' => $this->getBackendPort(),
+            '/* {{ ips }} */' => $this->getTransformedAccessList(),
+            '/* {{ design_exceptions_code }} */' => $this->getRegexForDesignExceptions(),
+            // http headers get transformed by php `X-Forwarded-Proto: https`
+            // becomes $SERVER['HTTP_X_FORWARDED_PROTO'] = 'https'
+            // Apache and Nginx drop all headers with underlines by default.
+            '/* {{ ssl_offloaded_header }} */' => str_replace('_', '-', $this->getSslOffloadedHeader()),
+            '/* {{ grace_period }} */' => $this->getGracePeriod(),
+        ];
+    }
+
+    /**
+     * Get regexs for design exceptions
+     * Different browser user-agents may use different themes
+     * Varnish supports regex with internal modifiers only so
+     * we have to convert "/pattern/iU" into "(?Ui)pattern"
+     *
+     * @return string
+     */
+    private function getRegexForDesignExceptions()
+    {
+        $result = '';
+        $tpl = "%s (req.http.user-agent ~ \"%s\") {\n"."        hash_data(\"%s\");\n"."    }";
+
+        $expressions = $this->getDesignExceptions();
+
+        if ($expressions) {
+            $rules = array_values($expressions);
+            foreach ($rules as $i => $rule) {
+                if (preg_match('/^[\W]{1}(.*)[\W]{1}(\w+)?$/', $rule['regexp'], $matches)) {
+                    if (!empty($matches[2])) {
+                        $pattern = sprintf("(?%s)%s", $matches[2], $matches[1]);
+                    } else {
+                        $pattern = $matches[1];
+                    }
+                    $if = $i == 0 ? 'if' : ' elsif';
+                    $result .= sprintf($tpl, $if, $pattern, $rule['value']);
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get IPs access list that can purge Varnish configuration for config file generation
+     * and transform it to appropriate view
+     *
+     * acl purge{
+     *  "127.0.0.1";
+     *  "127.0.0.2";
+     *
+     * @return string
+     */
+    private function getTransformedAccessList()
+    {
+        $tpl = "    \"%s\";";
+        $result = array_reduce($this->getAccessList(), function ($ips, $ip) use ($tpl) {
+            return $ips.sprintf($tpl, trim($ip))."\n";
+        }, '');
+
+        return $result;
+    }
+
+    /**
+     * Get access list
+     *
+     * @return array
+     */
+    private function getAccessList()
+    {
+        return $this->accessList;
+    }
+
+    /**
+     * Get backend host
+     *
+     * @return string
+     */
+    private function getBackendHost()
+    {
+        return $this->backendHost;
+    }
+
+    /**
+     * Get backend post
+     *
+     * @return int
+     */
+    private function getBackendPort()
+    {
+        return $this->backendPort;
+    }
+
+    /**
+     * Get grace period
+     *
+     * @return int
+     */
+    private function getGracePeriod()
+    {
+        return $this->gracePeriod;
+    }
+
+    /**
+     * Get SSL Offloaded Header
+     *
+     * @return string
+     */
+    private function getSslOffloadedHeader()
+    {
+        return $this->sslOffloadedHeader;
+    }
+
+    /**
+     * @return array
+     */
+    private function getDesignExceptions()
+    {
+        return $this->designExceptions;
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/PageCache/Model/Varnish/VclTemplateLocator.php b/app/code/Magento/PageCache/Model/Varnish/VclTemplateLocator.php
new file mode 100644
index 0000000000000..1d37c23deafc1
--- /dev/null
+++ b/app/code/Magento/PageCache/Model/Varnish/VclTemplateLocator.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\PageCache\Model\Varnish;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Module\Dir;
+use Magento\Framework\Module\Dir\Reader;
+use Magento\Framework\Filesystem\Directory\ReadFactory;
+use Magento\PageCache\Api\VclTemplateLocatorInterface;
+use Magento\PageCache\Exception\UnsupportedVarnishVersion;
+
+class VclTemplateLocator implements VclTemplateLocatorInterface
+{
+    /**
+     * XML path to Varnish 5 config template path
+     */
+    const VARNISH_5_CONFIGURATION_PATH = 'system/full_page_cache/varnish5/path';
+
+    /**
+     * XML path to Varnish 4 config template path
+     */
+    const VARNISH_4_CONFIGURATION_PATH = 'system/full_page_cache/varnish4/path';
+
+    /**
+     *
+     */
+    const VARNISH_SUPPORTED_VERSION_4 = '4';
+
+    /**
+     *
+     */
+    const VARNISH_SUPPORTED_VERSION_5 = '5';
+
+    /**
+     * @var array
+     */
+    private $supportedVarnishVersions = [
+        self::VARNISH_SUPPORTED_VERSION_4 => self::VARNISH_4_CONFIGURATION_PATH,
+        self::VARNISH_SUPPORTED_VERSION_5 => self::VARNISH_5_CONFIGURATION_PATH,
+    ];
+
+    /**
+     * @var Reader
+     */
+    private $reader;
+
+    /**
+     * @var ReadFactory
+     */
+    private $readFactory;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * VclTemplateLocator constructor.
+     *
+     * @param Reader $reader
+     * @param ReadFactory $readFactory
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(Reader $reader, ReadFactory $readFactory, ScopeConfigInterface $scopeConfig)
+    {
+        $this->reader = $reader;
+        $this->readFactory = $readFactory;
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTemplate($version)
+    {
+        $moduleEtcPath = $this->reader->getModuleDir(Dir::MODULE_ETC_DIR, 'Magento_PageCache');
+        $configFilePath = $moduleEtcPath . '/' . $this->scopeConfig->getValue($this->getVclTemplatePath($version));
+        $directoryRead = $this->readFactory->create($moduleEtcPath);
+        $configFilePath = $directoryRead->getRelativePath($configFilePath);
+        $template = $directoryRead->readFile($configFilePath);
+        return $template;
+    }
+
+    /**
+     * Get Vcl template path
+     *
+     * @param int $version Varnish version
+     * @return string
+     * @throws UnsupportedVarnishVersion
+     */
+    private function getVclTemplatePath($version)
+    {
+        if (!isset($this->supportedVarnishVersions[$version])) {
+            throw new UnsupportedVarnishVersion(__('Unsupported varnish version'));
+        }
+
+        return $this->supportedVarnishVersions[$version];
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/PageCache/etc/di.xml b/app/code/Magento/PageCache/etc/di.xml
index 567baa493be50..f890619ac8342 100644
--- a/app/code/Magento/PageCache/etc/di.xml
+++ b/app/code/Magento/PageCache/etc/di.xml
@@ -25,4 +25,13 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Console\CommandListInterface">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="VarnishGenerateVclCommand" xsi:type="object">Magento\PageCache\Console\Command\GenerateVclCommand</item>
+            </argument>
+        </arguments>
+    </type>
+    <preference for="Magento\PageCache\Api\VclGeneratorInterface" type="Magento\PageCache\Model\Varnish\VclGenerator"/>
+    <preference for="Magento\PageCache\Api\VclTemplateLocatorInterface" type="Magento\PageCache\Model\Varnish\VclTemplateLocator"/>
 </config>