@@ -3,32 +3,31 @@ import (
 	"crypto/sha256"
 	"encoding/base64"
-	"encoding/hex"
+	"fmt"
 	"hash/fnv"
 	"io"
 	"io/fs"
-	"path/filepath"
-	"strings"
 
 	"github.com/pkg/errors"
 )
 
 var Assets = &AssetCollection{
-	Scripts:         make(map[string]*Asset),
-	Stylesheets:     make(map[string]*Asset),
-	ByImmutablePath: make(map[string]*Asset),
+	Scripts:     make(map[string]*Asset),
+	Stylesheets: make(map[string]*Asset),
+	ByPath:      make(map[string]*Asset),
 }
 
 type Asset struct {
 	URL          string
+	ETag         string
 	Filename     string
 	Base64SHA256 string
 }
 
 type AssetCollection struct {
-	Scripts         map[string]*Asset
-	Stylesheets     map[string]*Asset
-	ByImmutablePath map[string]*Asset
+	Scripts     map[string]*Asset
+	Stylesheets map[string]*Asset
+	ByPath      map[string]*Asset
 }
 
 func newAsset(filename string) (*Asset, error) {
@@ -45,18 +44,13 @@ return nil, errors.WithMessagef(err, "could not hash file %s", filename) 	}
 
 	return &Asset{
-		URL:          makeImmutablePath(filename, hex.EncodeToString(hash.Sum(nil))),
+		URL:          "/" + filename,
+		ETag:         fmt.Sprintf(`W/"%x"`, hash.Sum(nil)),
 		Filename:     filename,
 		Base64SHA256: base64.StdEncoding.EncodeToString(shasum.Sum(nil)),
 	}, nil
 }
 
-func makeImmutablePath(filename string, hash string) string {
-	ext := filepath.Ext(filename)
-
-	return "/" + strings.Replace(filename, ext, "."+hash+ext, 1)
-}
-
 func hashScripts() error {
 	scripts, err := fs.Glob(Files, "static/**.js")
 	if err != nil {
@@ -68,7 +62,7 @@ if err != nil { 			return err
 		}
 		Assets.Scripts[filename] = asset
-		Assets.ByImmutablePath[asset.URL] = asset
+		Assets.ByPath[asset.URL] = asset
 	}
 
 	return nil
@@ -85,7 +79,7 @@ if err != nil { 			return err
 		}
 		Assets.Stylesheets[filename] = asset
-		Assets.ByImmutablePath[asset.URL] = asset
+		Assets.ByPath[asset.URL] = asset
 	}
 
 	return nil

@@ -261,15 +261,15 @@ mux.HandleFunc("/options/{source}/opensearch.xml", createOpenSearchXMLHandler(config.Options)) 	mux.HandleFunc("/packages/{source}/opensearch.xml", createOpenSearchXMLHandler(config.Packages))
 
 	mux.HandleFunc("/static/", func(w http.ResponseWriter, r *http.Request) {
-		// optimisation for HTTP/3: first header sent as byte(41), not the string
-		asset, found := frontend.Assets.ByImmutablePath[r.URL.Path]
+		asset, found := frontend.Assets.ByPath[r.URL.Path]
 		if !found {
 			http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
 
 			return
 		}
-		w.Header().Add("Cache-Control", "public, max-age=31536000")
-		w.Header().Add("Cache-Control", "immutable")
+		// optimisation for HTTP/3: first header sent as byte(41), not the string
+		w.Header().Add("Cache-Control", "public, max-age=86400")
+		w.Header().Add("Cache-Control", "stale-while-revalidate")
 		http.ServeFileFS(w, r, frontend.Files, asset.Filename)
 	})