diff --git a/.htaccess b/.htaccess
index 8a627fdd689..32f715da9a2 100644
--- a/.htaccess
+++ b/.htaccess
@@ -20,3 +20,13 @@ RedirectMatch permanent ^/xref/(.*)\.html$ https://git-wip-us.apache.org/repos/a
 # Redirect 0.94 pages to main site
 RedirectMatch permanent ^/0.94/(.*)$ /$1
 Redirect permanent /0.94 /
+
+ErrorDocument 404 /404/index.html
+
+<IfModule mod_headers.c>
+  Header always set Cache-Control "no-cache, must-revalidate"
+
+  <FilesMatch "\.(?:css|js|mjs|gif|ico|jpe?g|png|svg|webp|avif|woff2?|ttf|otf|eot|pdf)$">
+    Header always set Cache-Control "public, max-age=2592000, immutable"
+  </FilesMatch>
+</IfModule>