diff --git a/readthedocs/projects/views/public.py b/readthedocs/projects/views/public.py
index b98f295aeac..3ef3b89edcf 100644
--- a/readthedocs/projects/views/public.py
+++ b/readthedocs/projects/views/public.py
@@ -15,6 +15,7 @@
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import get_object_or_404, render_to_response
 from django.template import RequestContext
+from django.views.decorators.cache import cache_control
 from django.views.generic import ListView, DetailView
 from django.utils.datastructures import SortedDict
 from django.views.decorators.cache import cache_page
@@ -118,8 +119,7 @@ def _badge_return(redirect, url):
         return http_response
 
 
-# TODO remove this, it's a temporary fix to heavy database usage
-@cache_page(60 * 30)
+@cache_control(no_cache=True)
 def project_badge(request, project_slug, redirect=True):
     """Return a sweet badge for the project"""
     version_slug = request.GET.get('version', LATEST)