diff --git a/playbooks/roles/zuul-web/templates/openstack.vhost.j2 b/playbooks/roles/zuul-web/templates/openstack.vhost.j2
index b3dba4ea8d..bb4b6039a6 100644
--- a/playbooks/roles/zuul-web/templates/openstack.vhost.j2
+++ b/playbooks/roles/zuul-web/templates/openstack.vhost.j2
@@ -48,7 +48,7 @@
   RewriteRule ^/api/(.*)$ http://127.0.0.1:9000/api/tenant/openstack/$1 [P,L]
   RewriteRule ^/(.*)$ http://127.0.0.1:9000/$1 [P,L]
 
-  AddOutputFilterByType DEFLATE application/json
+  AddOutputFilterByType DEFLATE application/json text/css text/javascript application/javascript
 
   <IfModule mod_cache.c>
     CacheDefaultExpire 5
diff --git a/playbooks/roles/zuul-web/templates/zuul.vhost.j2 b/playbooks/roles/zuul-web/templates/zuul.vhost.j2
index 60a9512b6e..8d142b8ef8 100644
--- a/playbooks/roles/zuul-web/templates/zuul.vhost.j2
+++ b/playbooks/roles/zuul-web/templates/zuul.vhost.j2
@@ -46,15 +46,15 @@
   RewriteRule ^/api/tenant/(.*)/console-stream ws://127.0.0.1:9000/api/tenant/$1/console-stream [P,L]
   RewriteRule ^/(.*)$ http://127.0.0.1:9000/$1 [P,L]
 
-  AddOutputFilterByType DEFLATE application/json
+  AddOutputFilterByType DEFLATE application/json text/css text/javascript application/javascript
 
   <IfModule mod_cache.c>
     CacheDefaultExpire 5
     <IfModule mod_mem_cache.c>
       # TODO: Should we cache the rest of the API too?
-      CacheEnable mem /api/status
-      # 12MByte total cache size.
-      MCacheSize 12288
+      CacheEnable mem /api/tenant/.*/status
+      # 80MB max cache size. 10 objects at 8MB max each.
+      MCacheSize 81920
       MCacheMaxObjectCount 10
       MCacheMinObjectSize 1
       # 8MByte max size per cache entry
@@ -62,7 +62,7 @@
       MCacheMaxStreamingBuffer 8388608
     </IfModule>
     <IfModule mod_cache_disk.c>
-      CacheEnable disk /api/status
+      CacheEnable disk /api/tenant/.*/status
       CacheRoot /var/cache/apache2/mod_cache_disk
       CacheMaxFileSize 10000000
     </IfModule>