diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index fb607a0b962f9163750af29862df244f0802272d..ef7f4b153ffcc299386742cd3be67a24e48e723d 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -1924,6 +1924,8 @@ class TypoScriptFrontendController implements LoggerAwareInterface
         // Setting flag, so we know, that some cached content has been loaded
         $this->cacheContentFlag = true;
         $this->cacheExpires = $cachedData['expires'];
+        // Restore the current tags as they can be retrieved by getPageCacheTags()
+        $this->pageCacheTags = $cachedData['cacheTags'] ?? [];
 
         // Restore page title information, this is needed to generate the page title for
         // partially cached pages.
@@ -2604,6 +2606,8 @@ class TypoScriptFrontendController implements LoggerAwareInterface
             $tags = GeneralUtility::trimExplode(',', $this->page['cache_tags'], true);
             $this->pageCacheTags = array_merge($this->pageCacheTags, $tags);
         }
+        // Add the cache themselves as well, because they are fetched by getPageCacheTags()
+        $cacheData['cacheTags'] = $this->pageCacheTags;
         $this->pageCache->set($this->newHash, $cacheData, $this->pageCacheTags, $expirationTstamp - $GLOBALS['EXEC_TIME']);
     }