diff --git a/src/Resources/config/cache.xml b/src/Resources/config/cache.xml
index 9353daa9..be5bbfc1 100644
--- a/src/Resources/config/cache.xml
+++ b/src/Resources/config/cache.xml
@@ -70,15 +70,5 @@
         <service id="sonata.cache.invalidation.simple" class="Sonata\Cache\Invalidation\SimpleCacheInvalidation">
             <argument type="service" id="logger"/>
         </service>
-        <service id="sonata.cache.command.flush" class="Sonata\CacheBundle\Command\CacheFlushCommand">
-            <argument type="constant">null</argument>
-            <argument type="service" id="sonata.cache.manager"/>
-            <tag name="console.command"/>
-        </service>
-        <service id="sonata.cache.command.flushall" class="Sonata\CacheBundle\Command\CacheFlushAllCommand">
-            <argument type="constant">null</argument>
-            <argument type="service" id="sonata.cache.manager"/>
-            <tag name="console.command"/>
-        </service>
     </services>
 </container>
diff --git a/src/Resources/config/command.xml b/src/Resources/config/command.xml
index 27f36dfd..0d7435a2 100644
--- a/src/Resources/config/command.xml
+++ b/src/Resources/config/command.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="Sonata\CacheBundle\Command\CacheFlushAllCommand" class="Sonata\CacheBundle\Command\CacheFlushAllCommand" public="true">
+        <service id="Sonata\CacheBundle\Command\CacheFlushAllCommand" class="Sonata\CacheBundle\Command\CacheFlushAllCommand" public="true" autowire="true">
             <tag name="console.command"/>
         </service>
-        <service id="Sonata\CacheBundle\Command\CacheFlushCommand" class="Sonata\CacheBundle\Command\CacheFlushCommand" public="true">
+        <service id="sonata.cache.command.flushall" alias="Sonata\CacheBundle\Command\CacheFlushAllCommand"/>
+        <service id="Sonata\CacheBundle\Command\CacheFlushCommand" class="Sonata\CacheBundle\Command\CacheFlushCommand" public="true" autowire="true">
             <tag name="console.command"/>
         </service>
+        <service id="sonata.cache.command.flush" alias="Sonata\CacheBundle\Command\CacheFlushCommand"/>
     </services>
 </container>