Florent Torregrosa
--- a/src/EventSubscriber/CacheControlOverrideSubscriber.php
+++ b/src/EventSubscriber/CacheControlOverrideSubscriber.php
      }
+
+      // Check against global max-age.
+      $global_max_age = $this->configFactory->get('system.performance')
+        ->get('cache.page.max_age');
+      $maxAge = min($global_max_age, $maxAge);
+
      $response->headers->set('Cache-Control', 'public, max-age=' . $maxAge);
+
+      try {
+        // This is needed because page_cache uses this header to invalidate
+        // the page cache.
+        $response->setExpires(new \DateTime('+' . $maxAge . ' seconds'));
+      }
+      catch (\Exception) {
+        // Could not set Expires header because max-age is invalid.