Set proper expire headers, based on #3447821

Closes #3444257

core/modules/jsonapi/src/EventSubscriber/ResourceObjectNormalizationCacher.php

@@ -5,6 +5,7 @@
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Cache\VariationCacheInterface;
 use Drupal\jsonapi\JsonApiResource\ResourceObject;
+use Drupal\jsonapi\Normalizer\Value\CacheableNormalization;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Event\TerminateEvent;
@@ -102,7 +103,39 @@ public function get(ResourceObject $object) {
     }
 
     $cached = $this->variationCache->get($this->generateCacheKeys($object), new CacheableMetadata());
-    return $cached ? $cached->data : FALSE;
+    if (!$cached) {
+      return FALSE;
+    }
+
+    // When a cache hit occurs, we first calculate the remaining time before the
+    // cached record expires, ensuring that we do not reset the expiration with
+    // one that might have been generated on an earlier timestamp. This is done
+    // by subtracting the current timestamp from the cached record's expiration
+    // timestamp. If the max-age is set, we adjust it by merging the calculated
+    // remaining time with the original max-age of the cached item, ensuring
+    // that the expiration remains accurate based on the current cache state
+    // and timestamp.
+    $normalizer_values = $cached->data;
+    assert(is_array($normalizer_values));
+    if ($cached->expire >= 0) {
+      $max_age = max($cached->expire - $this->requestStack->getCurrentRequest()->server->get('REQUEST_TIME'), 0);
+      $cacheability = new CacheableMetadata();
+      $cacheability->setCacheMaxAge($max_age);
+
+      $subsets = [
+        ResourceObjectNormalizationCacher::RESOURCE_CACHE_SUBSET_BASE,
+        ResourceObjectNormalizationCacher::RESOURCE_CACHE_SUBSET_FIELDS,
+      ];
+      foreach ($subsets as $subset) {
+        foreach ($normalizer_values[$subset] as $name => $normalization) {
+          assert($normalization instanceof CacheableNormalization);
+          if ($normalization->getCacheMaxAge() > 0) {
+            $normalizer_values[$subset][$name] = $normalization->withCacheableDependency($cacheability);
+          }
+        }
+      }
+    }
+    return $normalizer_values;
   }
 
   /**