diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf
index 5b517c9eba1..bd98cae12cd 100644
--- a/config/nginx/onlyoffice.conf
+++ b/config/nginx/onlyoffice.conf
@@ -22,6 +22,11 @@ map $request_uri $header_x_frame_options {
   default "SAMEORIGIN";
 }
 
+map $request_uri $cache_control {
+  default "public, max-age=10, s-maxage=24h";
+  ~*^/(api\/2\.0*|storage|login\.ashx|products\/*\/httphandlers\/filehandler.ashx|ChunkedUploader.ashx|apisystem|sh) "no-cache, no-store, must-revalidate";
+}
+
 include /etc/nginx/includes/onlyoffice-*.conf;
 
 server {
@@ -29,6 +34,8 @@ server {
 
 	add_header Access-Control-Allow-Origin *;
 	add_header X-Frame-Options $header_x_frame_options;
+	add_header Cache-Control $cache_control;
+	etag on;
 
 	large_client_header_buffers 4 16k;
 
@@ -74,33 +81,28 @@ server {
 	}
 
 	location / {
+		
 		proxy_pass http://localhost:5001;
-		expires 365d;
-		location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) {
-			expires 365d;
+			location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) {
 			root $public_root;
 			try_files /$basename /index.html =404;
 		}
 		
 		location ~* /static/images/ {
-			expires 365d;
 			root $public_root;
 			try_files /images/$basename /index.html =404;
 		}
 		
 		location ~* /static/offline/ {
-			expires 365d;
 			root $public_root;
 			try_files /offline/$basename /index.html =404;
         }
 		location ~* /thirdparty/ {
-			expires 365d;
 			root $public_root;
 			try_files /thirdparty/third-party.html /index.html =404;
         }
 		
 		location ~* /static/locales/(?<content>[^/]+) {
-			expires 365d;
 			root $public_root;
 			try_files /locales/$content/$basename /index.html =404;
         }
@@ -108,12 +110,10 @@ server {
 	
 	location /login {
 		#rewrite login/(.*) /$1  break;
-		expires 365d;
 		proxy_pass http://localhost:5011;
     }
 				
 	location /sockjs-node {
-		expires 365d;
 		proxy_set_header X-Real-IP  $remote_addr;
 		proxy_set_header X-Forwarded-For $remote_addr;
 		proxy_set_header Host $host;
@@ -128,26 +128,22 @@ server {
 	}
 	
 	location /api/2.0 {
-		expires -1;
+		add_header Cache-Control $cache_control;
 		location ~* /(files|encryption|privacyroom) {
-			 expires -1;
 			 proxy_pass http://localhost:5007;
 			 proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 		}
 		
 		location ~* /(people|group) {
-			 expires -1;
 			 proxy_pass http://localhost:5004;
 			 proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 		}
 		
 		location ~* /(authentication|modules|portal|security|settings|smtpsettings|capabilities|thirdparty) {
-			 expires -1;
 			 proxy_pass http://localhost:5000;
 			 proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 			  
 			 location ~* portal/(.*)(backup|restore)(.*) {
-				 expires -1;
 				 rewrite (.*)/portal/(.*) $1/backup/$2  break;
 				 proxy_redirect     off;
 				  
@@ -158,44 +154,39 @@ server {
 		}
 		
 		location ~* /backup {
-			 expires -1;
 			 proxy_pass http://localhost:5012;
 			 proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 		}
 		
 		location ~* /project {
-			 expires -1;
 			 proxy_pass http://localhost:5020;
 			 proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 		}
 		
 		location ~* /crm {
-			 expires -1;			
 			 proxy_pass http://localhost:5021;
 			 proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 		}
 		
 		location ~* /mail {
-			expires -1;
 			proxy_pass http://localhost:5022;
 			proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 		}
 		
 		location ~* /calendar {
-			expires -1;
 			proxy_pass http://localhost:5023;
 			proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 		}
     }
 
 	location /storage {
-		expires -1;
+		add_header Cache-Control $cache_control;
 		proxy_pass http://localhost:5003;
 		proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 	}
 	
 	location /login.ashx {
-		expires -1;
+		add_header Cache-Control $cache_control;
 		proxy_pass http://localhost:5003;
 		proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 	}
@@ -204,12 +195,10 @@ server {
 	location /products {   
 		location ~* /people {
 			#rewrite products/people/(.*) /$1  break;
-			expires 365d;
 			proxy_pass http://localhost:5002;
 			proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 		
 			location ~* /(sockjs-node) {
-				expires 365d;
 				rewrite products/people(.*)/(sockjs-node)/(.*) /$2/$3  break;
 				proxy_set_header X-Real-IP  $remote_addr;
 				proxy_set_header X-Forwarded-For $remote_addr;
@@ -226,7 +215,6 @@ server {
             
 			
 			location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) {
-				expires 365d;
 				root $public_root;
 				try_files /$basename /index.html =404;
 			}
@@ -234,7 +222,6 @@ server {
 		
 		location ~* /files/doceditor {
 			#rewrite products/files/doceditor/(.*) /$1  break;
-			expires 365d;
 			proxy_pass http://localhost:5013;
 			proxy_redirect off;
 			proxy_set_header Host $host;
@@ -248,12 +235,10 @@ server {
 	
 	location ~* /files {
 		#rewrite products/files/(.*) /$1  break;
-		expires 365d;
 		proxy_pass http://localhost:5008;
 		proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 		
 		location ~* /sockjs-node {
-			expires 365d;
 			rewrite products/files(.*)/sockjs-node/(.*) /$2/$3  break;
 			proxy_set_header X-Real-IP  $remote_addr;
 			proxy_set_header X-Forwarded-For $remote_addr;
@@ -268,13 +253,12 @@ server {
 		}
 			
 	 		location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) {
-				 expires 365d;
 				 root $public_root;
 				 try_files /$basename /index.html =404;
 			}
 			
 			location ~* (/httphandlers/filehandler.ashx|ChunkedUploader.ashx) {
-				expires -1;
+				add_header Cache-Control $cache_control;
 				proxy_pass http://localhost:5007;
 				proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 			}
@@ -282,12 +266,10 @@ server {
 		
 		location ~* /crm {
 			#rewrite products/crm/(.*) /$1  break;
-			expires 365d;
 			proxy_pass http://localhost:5014;
 			proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 		
 			location ~* /sockjs-node {
-				expires 365d;
 				rewrite products/crm(.*)/sockjs-node/(.*) /$2/$3  break;
 				proxy_set_header X-Real-IP  $remote_addr;
 				proxy_set_header X-Forwarded-For $remote_addr;
@@ -303,13 +285,12 @@ server {
 			}
 			
 			location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) {
-				expires 365d;
 				root $public_root;
 				try_files /$basename /index.html =404;
 			}
 			
 			location ~* (/httphandlers/filehandler.ashx|ChunkedUploader.ashx) {
-				expires -1;
+				add_header Cache-Control $cache_control;
 				proxy_pass http://localhost:5007;
 				proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 			}
@@ -317,12 +298,10 @@ server {
 		
 		location ~* /projects {
 			#rewrite products/projects/(.*) /$1  break;
-			expires 365d;
 			proxy_pass http://localhost:5015;
 			proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 		
 		location ~* /sockjs-node {
-			expires 365d;
 			rewrite products/projects(.*)/sockjs-node/(.*) /$2/$3  break;
 			proxy_set_header X-Real-IP  $remote_addr;
 			proxy_set_header X-Forwarded-For $remote_addr;
@@ -338,13 +317,12 @@ server {
 		}
 			
 			location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) {
-				expires 365d;
 				root $public_root;
 				try_files /$basename /index.html =404;
 			}
 			
 			location ~* (/httphandlers/filehandler.ashx|ChunkedUploader.ashx) {
-				expires -1;
+				add_header Cache-Control $cache_control;
 				proxy_pass http://localhost:5007;
 				proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 			}
@@ -352,12 +330,10 @@ server {
 		
 		location ~* /mail {
 			#rewrite products/mail/(.*) /$1  break;
-			expires 365d;
 			proxy_pass http://localhost:5016;
 			proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 		
 			location ~* /sockjs-node {
-				expires 365d;
 				rewrite products/projects(.*)/sockjs-node/(.*) /$2/$3  break;
 				proxy_set_header X-Real-IP  $remote_addr;
 				proxy_set_header X-Forwarded-For $remote_addr;
@@ -373,13 +349,12 @@ server {
 			}
 			
 			location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) {
-				expires 365d;
 				root $public_root;
 				try_files /$basename /index.html =404;
 			}
 			
 			location ~* (/httphandlers/filehandler.ashx|ChunkedUploader.ashx) {
-				expires -1;
+				add_header Cache-Control $cache_control;
 				proxy_pass http://localhost:5007;
 				proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 			}
@@ -387,12 +362,10 @@ server {
 		
 		location ~* /calendar {
 			#rewrite products/calendar/(.*) /$1  break;
-			expires 365d;
 			proxy_pass http://localhost:5017;
 			proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 		
 			location ~* /sockjs-node {
-				expires 365d;
 				rewrite products/projects(.*)/sockjs-node/(.*) /$2/$3  break;
 				proxy_set_header X-Real-IP  $remote_addr;
 				proxy_set_header X-Forwarded-For $remote_addr;
@@ -408,13 +381,12 @@ server {
 			}
 			
 			location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) {
-				expires 365d;
 				root $public_root;
 				try_files /$basename /index.html =404;
 			}
 			
 			location ~* (/httphandlers/filehandler.ashx|ChunkedUploader.ashx) {
-				expires -1;
+				add_header Cache-Control $cache_control;
 				proxy_pass http://localhost:5007;
 				proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 			}
@@ -422,14 +394,14 @@ server {
 	}
 	
 	location /apisystem {
-		expires -1;
+		add_header Cache-Control $cache_control;
 		rewrite apisystem/(.*) /$1  break;
 		proxy_pass http://localhost:5010;
 		proxy_set_header X-REWRITER-URL $X_REWRITER_URL;
 	}
 	
 	location /sh {
-		expires -1;
+		add_header Cache-Control $cache_control;
 		rewrite sh/(.*) /$1  break;
 		proxy_pass http://localhost:9999;
 		proxy_set_header X-REWRITER-URL $X_REWRITER_URL;