diff --git a/Resources/config/assetic.xml b/Resources/config/assetic.xml
index 7d059791..090421b4 100644
--- a/Resources/config/assetic.xml
+++ b/Resources/config/assetic.xml
@@ -8,7 +8,6 @@
         <parameter key="assetic.asset_factory.class">Symfony\Bundle\AsseticBundle\Factory\AssetFactory</parameter>
         <parameter key="assetic.asset_manager.class">Assetic\Factory\LazyAssetManager</parameter>
         <parameter key="assetic.asset_manager_cache_warmer.class">Symfony\Bundle\AsseticBundle\CacheWarmer\AssetManagerCacheWarmer</parameter>
-        <parameter key="assetic.cached_formula_loader.class">Assetic\Factory\Loader\CachedFormulaLoader</parameter>
         <parameter key="assetic.config_cache.class">Assetic\Cache\ConfigCache</parameter>
         <parameter key="assetic.config_loader.class">Symfony\Bundle\AsseticBundle\Factory\Loader\ConfigurationLoader</parameter>
         <parameter key="assetic.config_resource.class">Symfony\Bundle\AsseticBundle\Factory\Resource\ConfigurationResource</parameter>
diff --git a/Resources/config/templating_php.xml b/Resources/config/templating_php.xml
index b6843d92..741419f6 100644
--- a/Resources/config/templating_php.xml
+++ b/Resources/config/templating_php.xml
@@ -8,6 +8,7 @@
         <parameter key="assetic.helper.dynamic.class">Symfony\Bundle\AsseticBundle\Templating\DynamicAsseticHelper</parameter>
         <parameter key="assetic.helper.static.class">Symfony\Bundle\AsseticBundle\Templating\StaticAsseticHelper</parameter>
         <parameter key="assetic.php_formula_loader.class">Symfony\Bundle\AsseticBundle\Factory\Loader\AsseticHelperFormulaLoader</parameter>
+        <parameter key="assetic.cached_formula_loader.class">Assetic\Factory\Loader\CachedFormulaLoader</parameter>
     </parameters>
 
     <services>
diff --git a/Resources/config/templating_twig.xml b/Resources/config/templating_twig.xml
index 8ab025bb..9e8cb92c 100644
--- a/Resources/config/templating_twig.xml
+++ b/Resources/config/templating_twig.xml
@@ -14,20 +14,15 @@
             <tag name="twig.extension" />
             <tag name="assetic.templating.twig" />
             <argument type="service" id="assetic.asset_factory" />
+            <argument type="service" id="assetic.config_cache" />
             <argument type="service" id="templating.name_parser" />
             <argument>%assetic.use_controller%</argument>
             <argument>%assetic.twig_extension.functions%</argument>
             <argument>%assetic.bundles%</argument>
             <argument type="service" id="assetic.value_supplier" on-invalid="null" />
         </service>
-        <service id="assetic.twig_formula_loader" class="%assetic.cached_formula_loader.class%" public="false">
+        <service id="assetic.twig_formula_loader" class="%assetic.twig_formula_loader.class%" public="false">
             <tag name="assetic.formula_loader" alias="twig" />
-            <tag name="assetic.templating.twig" />
-            <argument type="service" id="assetic.twig_formula_loader.real" />
-            <argument type="service" id="assetic.config_cache" />
-            <argument>%kernel.debug%</argument>
-        </service>
-        <service id="assetic.twig_formula_loader.real" class="%assetic.twig_formula_loader.class%" public="false">
             <tag name="assetic.templating.twig" />
             <argument type="service" id="twig" />
         </service>
diff --git a/Tests/FunctionalTest.php b/Tests/FunctionalTest.php
index 814c1cdb..090785f5 100644
--- a/Tests/FunctionalTest.php
+++ b/Tests/FunctionalTest.php
@@ -20,27 +20,27 @@
  */
 class FunctionalTest extends \PHPUnit_Framework_TestCase
 {
-    protected $cacheDir;
+    static protected $cacheDir;
 
-    protected function setUp()
+    static public function setUpBeforeClass()
     {
         if (!class_exists('Assetic\\AssetManager')) {
-            $this->markTestSkipped('Assetic is not available.');
+            self::markTestSkipped('Assetic is not available.');
         }
 
-        $this->cacheDir = __DIR__.'/Resources/cache';
-        if (file_exists($this->cacheDir)) {
+        self::$cacheDir = __DIR__.'/Resources/cache';
+        if (file_exists(self::$cacheDir)) {
             $filesystem = new Filesystem();
-            $filesystem->remove($this->cacheDir);
+            $filesystem->remove(self::$cacheDir);
         }
 
-        mkdir($this->cacheDir, 0777, true);
+        mkdir(self::$cacheDir, 0777, true);
     }
 
-    protected function tearDown()
+    static public function tearDownAfterClass()
     {
         $filesystem = new Filesystem();
-        $filesystem->remove($this->cacheDir);
+        $filesystem->remove(self::$cacheDir);
     }
 
     public function testTwigRenderDebug()
diff --git a/Twig/AsseticExtension.php b/Twig/AsseticExtension.php
index 3e84fe3f..5e72a252 100644
--- a/Twig/AsseticExtension.php
+++ b/Twig/AsseticExtension.php
@@ -11,9 +11,10 @@
 
 namespace Symfony\Bundle\AsseticBundle\Twig;
 
-use Assetic\ValueSupplierInterface;
+use Assetic\Cache\ConfigCache;
 use Assetic\Extension\Twig\AsseticExtension as BaseAsseticExtension;
 use Assetic\Factory\AssetFactory;
+use Assetic\ValueSupplierInterface;
 use Symfony\Component\Templating\TemplateNameParserInterface;
 
 /**
@@ -27,9 +28,9 @@ class AsseticExtension extends BaseAsseticExtension
     private $templateNameParser;
     private $enabledBundles;
 
-    public function __construct(AssetFactory $factory, TemplateNameParserInterface $templateNameParser, $useController = false, $functions = array(), $enabledBundles = array(), ValueSupplierInterface $valueSupplier = null)
+    public function __construct(AssetFactory $factory, ConfigCache $cache, TemplateNameParserInterface $templateNameParser, $useController = false, $functions = array(), $enabledBundles = array(), ValueSupplierInterface $valueSupplier = null)
     {
-        parent::__construct($factory, $functions, $valueSupplier);
+        parent::__construct($factory, $cache, $functions, $valueSupplier);
 
         $this->useController = $useController;
         $this->templateNameParser = $templateNameParser;
@@ -47,9 +48,9 @@ public function getTokenParsers()
 
     public function getNodeVisitors()
     {
-        return array(
+        return array_merge(parent::getNodeVisitors(), array(
             new AsseticNodeVisitor($this->templateNameParser, $this->enabledBundles),
-        );
+        ));
     }
 
     public function getGlobals()
diff --git a/composer.json b/composer.json
index c3396a48..608c30e6 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
     "require": {
         "php": ">=5.3.0",
         "symfony/framework-bundle": ">=2.1.0,<2.3-dev",
-        "kriswallsmith/assetic": "1.1.*"
+        "kriswallsmith/assetic": "dev-node-visitor"
     },
     "require-dev": {
         "symfony/twig-bundle": ">=2.1.0,<2.3-dev",