diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp
index 022c716..73f56cb 100644
--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@@ -430,14 +430,14 @@ static int accessHandlerCallback(void *cls,
   *ptr = NULL;
 
   /* Force to close the connection - cf. 100% CPU usage with v. 4.4 (in Lucid) */
-  MHD_add_response_header(response, MHD_HTTP_HEADER_CONNECTION, "close");
+  //MHD_add_response_header(response, MHD_HTTP_HEADER_CONNECTION, "close");
 
   /* Allow cross-domain requests */
   //MHD_add_response_header(response, MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN, "*");
   MHD_add_response_header(response, "Access-Control-Allow-Origin", "*");
 
   if (cacheEnabled) { /* Force cache */
-    MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL, "max-age=87840, must-revalidate");
+    MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL, "max-age=2723040, public");
   } else { /* Prevent cache (for random page) */
     MHD_add_response_header(response, MHD_HTTP_HEADER_CACHE_CONTROL, "no-cache, no-store, must-revalidate");
   }