diff --git a/h5bp/web_performance/cache_expiration.conf b/h5bp/web_performance/cache_expiration.conf
index 85f191c..ee2b588 100644
--- a/h5bp/web_performance/cache_expiration.conf
+++ b/h5bp/web_performance/cache_expiration.conf
@@ -19,14 +19,14 @@ map $sent_http_content_type $expires {
   ~*text/css                              1y;
 
   # Data interchange
-  ~*application/atom+xml                  1h;
-  ~*application/rdf+xml                   1h;
-  ~*application/rss+xml                   1h;
+  ~*application/atom\+xml                 1h;
+  ~*application/rdf\+xml                  1h;
+  ~*application/rss\+xml                  1h;
 
   ~*application/json                      0;
-  ~*application/ld+json                   0;
-  ~*application/schema+json               0;
-  ~*application/geo+json                  0;
+  ~*application/ld\+json                  0;
+  ~*application/schema\+json              0;
+  ~*application/geo\+json                 0;
   ~*application/xml                       0;
   ~*text/calendar                         0;
   ~*text/xml                              0;
@@ -44,8 +44,8 @@ map $sent_http_content_type $expires {
   ~*text/javascript                       1y;
 
   # Manifest files
-  ~*application/manifest+json             1w;
-  ~*application/x-web-app-manifest+json   0;
+  ~*application/manifest\+json            1w;
+  ~*application/x-web-app-manifest\+json  0;
   ~*text/cache-manifest                   0;
 
   # Markdown