Merge branch 'master' into metrics/requestDetailsTrace

Author: filafb

CHANGELOG.md

@@ -7,14 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [6.46.0] - 2023-10-25
 ### Added
-
 - Add disk cache steps and retry count to tracing
 
+### Changed
+- Stop updating client cache when revalidated and still expired
+
 ## [6.45.24] - 2023-10-05
 ### Added
 
 - Allow disabling memoization for all requests of a client
+
 ## [6.45.23] - 2023-10-04
 
 ### Fixed

src/HttpClient/middlewares/cache.ts

@@ -211,7 +211,15 @@ export const cacheMiddleware = ({ type, storage }: CacheOptions) => {
         ? (data as Buffer).toString(responseEncoding)
         : data
 
-      const expiration = Date.now() + (maxAge - currentAge) * 1000
+      const now = Date.now()
+      const expiration = now + (maxAge - currentAge) * 1000
+
+      const alreadyExpired = expiration <= now
+      const reusingRevalidatedCache = cached && (ctx.response === cached.response)
+      const shouldSkipCacheUpdate = alreadyExpired && reusingRevalidatedCache
+      if (shouldSkipCacheUpdate) {
+        return
+      }
 
       const cacheWriteSpan = createCacheSpan(cacheType, 'write', tracer, span)
       try {