diff --git a/docker/nginx.conf b/docker/nginx.conf
index 0bda742..f5076cb 100644
--- a/docker/nginx.conf
+++ b/docker/nginx.conf
@@ -99,6 +99,8 @@ http {
             proxy_cache_valid 301 307 12h;
             proxy_cache_valid 500 502 503 504 0s;
             proxy_cache_valid any 72h;
+            proxy_hide_header Cache-Control;
+            add_header Cache-Control "public, max-age=3600";
             add_header X-Cache $upstream_cache_status;
         }
 
diff --git a/mediaproxy/views.py b/mediaproxy/views.py
index 11aea5d..62a5b85 100644
--- a/mediaproxy/views.py
+++ b/mediaproxy/views.py
@@ -31,6 +31,7 @@ class BaseProxyView(View):
                 headers={
                     "X-Accel-Redirect": "/__takahe_accel__/",
                     "X-Takahe-RealUri": remote_url,
+                    "Cache-Control": "public, max-age=3600",
                 },
             )
         else: