diff --git a/middleware/404.js b/middleware/404.js
index e90ed3c3..85d81c70 100644
--- a/middleware/404.js
+++ b/middleware/404.js
@@ -1,7 +1,7 @@
 
 // handle not found errors
 function middleware(req, res) {
-  res.header('Cache-Control','public,max-age=300'); // 5 minute cache
+  res.header('Cache-Control','public');
   res.status(404).json({ error: 'not found: invalid path' });
 }
 
diff --git a/middleware/408.js b/middleware/408.js
index ffbb6066..8e57eb28 100644
--- a/middleware/408.js
+++ b/middleware/408.js
@@ -1,7 +1,7 @@
 
 // handle time out errors
 function middleware(err, req, res, next) {
-  res.header('Cache-Control','no-cache');
+  res.header('Cache-Control','public');
   var error = (err && err.message) ? err.message : err;
   
   if( res.statusCode === 408 || (error.toLowerCase().indexOf('request timeout') !== -1) ){ 
diff --git a/middleware/500.js b/middleware/500.js
index cc3f8325..92acea60 100644
--- a/middleware/500.js
+++ b/middleware/500.js
@@ -3,7 +3,7 @@ var logger = require( 'pelias-logger' ).get( 'middleware-500' );
 // handle application errors
 function middleware(err, req, res, next) {
   logger.error( 'Error: `%s`. Stack trace: `%s`.', err, err.stack );
-  res.header('Cache-Control','no-cache');
+  res.header('Cache-Control','public');
   var error = (err && err.message) ? err.message : err;
 
   if( res.statusCode < 400 ){ res.status(500); }
diff --git a/middleware/headers.js b/middleware/headers.js
index 4b40dd21..a747be33 100644
--- a/middleware/headers.js
+++ b/middleware/headers.js
@@ -3,7 +3,7 @@ var pkg = require('../package');
 
 function middleware(req, res, next){
   res.header('Charset','utf8');
-  res.header('Cache-Control','public,max-age=60');
+  res.header('Cache-Control','public');
   res.header('Server', 'Pelias/'+pkg.version);
   res.header('X-Powered-By', 'mapzen');
   next();
diff --git a/test/ciao/404.coffee b/test/ciao/404.coffee
index 7a22618d..9f6a9c3c 100644
--- a/test/ciao/404.coffee
+++ b/test/ciao/404.coffee
@@ -9,7 +9,7 @@ response.statusCode.should.be.equal 404
 response.should.have.header 'Content-Type','application/json; charset=utf-8'
 
 #? cache-control header correctly set
-response.should.have.header 'Cache-Control','public,max-age=300'
+response.should.have.header 'Cache-Control','public'
 
 #? should respond in json with server info
 should.exist json
diff --git a/test/ciao/index.coffee b/test/ciao/index.coffee
index 8dd9da90..aac96fd9 100644
--- a/test/ciao/index.coffee
+++ b/test/ciao/index.coffee
@@ -12,7 +12,7 @@ response.should.have.header 'Content-Type','text/html; charset=utf-8'
 response.should.have.header 'Charset','utf8'
 
 #? cache-control header correctly set
-response.should.have.header 'Cache-Control','public,max-age=60'
+response.should.have.header 'Cache-Control','public'
 
 #? server header correctly set
 response.should.have.header 'Server'