diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php
index 65827eba5a6b8..8557a2f55aca1 100644
--- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php
+++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheCacheWarmer.php
@@ -31,15 +31,16 @@ class TemplateCacheCacheWarmer implements CacheWarmerInterface
     /**
      * Constructor.
      *
-     * @param ContainerInterface      $container The dependency injection container
-     * @param TemplateFinderInterface $finder    The template paths cache warmer
+     * @param ContainerInterface           $container The dependency injection container
+     * @param TemplateFinderInterface|null $finder    The template paths cache warmer
      */
-    public function __construct(ContainerInterface $container, TemplateFinderInterface $finder)
+    public function __construct(ContainerInterface $container, TemplateFinderInterface $finder = null)
     {
         // We don't inject the Twig environment directly as it depends on the
         // template locator (via the loader) which might be a cached one.
         // The cached template locator is available once the TemplatePathsCacheWarmer
-        // has been warmed up
+        // has been warmed up.
+        // But it can also be null if templating has been disabled.
         $this->container = $container;
         $this->finder = $finder;
     }
@@ -51,6 +52,10 @@ public function __construct(ContainerInterface $container, TemplateFinderInterfa
      */
     public function warmUp($cacheDir)
     {
+        if (null === $this->finder) {
+            return;
+        }
+
         $twig = $this->container->get('twig');
 
         foreach ($this->finder->findAllTemplates() as $template) {
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
index f4344c7434966..87469984688ab 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -68,9 +68,7 @@ public function process(ContainerBuilder $container)
             $container->getDefinition('twig.extension.debug')->addTag('twig.extension');
         }
 
-        if ($container->has('templating')) {
-            $container->getDefinition('twig.cache_warmer')->addTag('kernel.cache_warmer');
-        } else {
+        if (!$container->has('templating')) {
             $loader = $container->getDefinition('twig.loader.native_filesystem');
             $loader->addTag('twig.loader');
             $loader->setMethodCalls($container->getDefinition('twig.loader.filesystem')->getMethodCalls());
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index 9e1a11777418c..6a13980fcd048 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -46,8 +46,9 @@
         </service>
 
         <service id="twig.cache_warmer" class="%twig.cache_warmer.class%" public="false">
+            <tag name="kernel.cache_warmer" />
             <argument type="service" id="service_container" />
-            <argument type="service" id="templating.finder" />
+            <argument type="service" id="templating.finder" on-invalid="ignore" />
         </service>
 
         <service id="twig.loader.native_filesystem" class="Twig_Loader_Filesystem" public="false">
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php
new file mode 100644
index 0000000000000..610bfa3b58be1
--- /dev/null
+++ b/src/Symfony/Bundle/TwigBundle/Tests/Functional/CacheWarmingTest.php
@@ -0,0 +1,116 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\TwigBundle\Tests;
+
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\Filesystem\Filesystem;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\TwigBundle\TwigBundle;
+
+class NewCacheWamingTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCacheIsProperlyWarmedWhenTemplatingIsAvailable()
+    {
+        $kernel = new CacheWarmingKernel(true);
+        $kernel->boot();
+
+        $warmer = $kernel->getContainer()->get('cache_warmer');
+        $warmer->enableOptionalWarmers();
+        $warmer->warmUp($kernel->getCacheDir());
+
+        $this->assertTrue(file_exists($kernel->getCacheDir().'/twig'));
+    }
+
+    public function testCacheIsNotWarmedWhenTemplatingIsDisabled()
+    {
+        $kernel = new CacheWarmingKernel(false);
+        $kernel->boot();
+
+        $warmer = $kernel->getContainer()->get('cache_warmer');
+        $warmer->enableOptionalWarmers();
+        $warmer->warmUp($kernel->getCacheDir());
+
+        $this->assertFalse(file_exists($kernel->getCacheDir().'/twig'));
+    }
+
+    protected function setUp()
+    {
+        $this->deleteTempDir();
+    }
+
+    protected function tearDown()
+    {
+        $this->deleteTempDir();
+    }
+
+    private function deleteTempDir()
+    {
+        if (!file_exists($dir = sys_get_temp_dir().'/'.Kernel::VERSION.'/CacheWarmingKernel')) {
+            return;
+        }
+
+        $fs = new Filesystem();
+        $fs->remove($dir);
+    }
+}
+
+class CacheWarmingKernel extends Kernel
+{
+    private $withTemplating;
+
+    public function __construct($withTemplating)
+    {
+        $this->withTemplating = $withTemplating;
+
+        parent::__construct('dev', true);
+    }
+
+    public function getName()
+    {
+        return 'CacheWarming';
+    }
+
+    public function registerBundles()
+    {
+        return array(new FrameworkBundle(), new TwigBundle());
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load(function ($container) {
+            $container->loadFromExtension('framework', array(
+                'secret' => '$ecret',
+            ));
+        });
+
+        if ($this->withTemplating) {
+            $loader->load(function ($container) {
+                $container->loadFromExtension('framework', array(
+                    'secret' => '$ecret',
+                    'templating' => array('engines' => array('twig')),
+                    'router' => array('resource' => '%kernel.root_dir%/Resources/config/empty_routing.yml'),
+                ));
+            });
+        }
+    }
+
+    public function getCacheDir()
+    {
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/CacheWarmingKernel/cache';
+    }
+
+    public function getLogDir()
+    {
+        return sys_get_temp_dir().'/'.Kernel::VERSION.'/CacheWarmingKernel/logs';
+    }
+}
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Functional/Resources/config/empty_routing.yml b/src/Symfony/Bundle/TwigBundle/Tests/Functional/Resources/config/empty_routing.yml
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
index b52e497b67f63..ccd3484c66202 100644
--- a/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -28,6 +28,7 @@
         "symfony/dependency-injection": "~2.6,>=2.6.6",
         "symfony/expression-language": "~2.4",
         "symfony/config": "~2.2",
+        "symfony/finder": "~2.0,>=2.0.5",
         "symfony/routing": "~2.1",
         "symfony/templating": "~2.1",
         "symfony/yaml": "~2.3",

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/16262.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/16262.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/16262.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/symfony/symfony/pull/16262.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>