diff --git a/src/PUGX/BadgeBundle/Controller/BadgeController.php b/src/PUGX/BadgeBundle/Controller/BadgeController.php
index ec986a2e..f6c5e5f2 100644
--- a/src/PUGX/BadgeBundle/Controller/BadgeController.php
+++ b/src/PUGX/BadgeBundle/Controller/BadgeController.php
@@ -15,6 +15,7 @@
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
 use PUGX\BadgeBundle\Exception\UnexpectedValueException;
 
 /**
@@ -48,6 +49,7 @@ class BadgeController extends ContainerAware
      *         }
      *     )
      * @Method({"GET"})
+     * @Cache(maxage="3600", smaxage="3600", public=true)
      *
      * @return StreamedResponse
      */
@@ -91,6 +93,7 @@ public function downloadsAction($repository, $type = 'total')
      *         }
      *     )
      * @Method({"GET"})
+     * @Cache(maxage="3600", smaxage="3600", public=true)
      *
      * @return StreamedResponse
      */
diff --git a/src/PUGX/BadgeBundle/Controller/PageController.php b/src/PUGX/BadgeBundle/Controller/PageController.php
index c80a30ee..097064c1 100644
--- a/src/PUGX/BadgeBundle/Controller/PageController.php
+++ b/src/PUGX/BadgeBundle/Controller/PageController.php
@@ -26,7 +26,7 @@ class PageController extends ContainerAware
      *     )
      * @Method({"GET"})
      * @Template
-     * @Cache(smaxage="3600")
+     * @Cache(maxage="3600", smaxage="3600", public=true)
      * @return Response
      */
     public function homeAction()