diff --git a/redaxo/src/addons/structure/plugins/content/lib/api_template.php b/redaxo/src/addons/structure/plugins/content/lib/api_template.php
index 7d655afd90..2d7674e14b 100644
--- a/redaxo/src/addons/structure/plugins/content/lib/api_template.php
+++ b/redaxo/src/addons/structure/plugins/content/lib/api_template.php
@@ -100,7 +100,7 @@ public static function getFilePath($templateId)
      */
     public static function getTemplatesDir()
     {
-        return rex_path::addonCache('templates');
+        return rex_path::addonCache('structure', 'templates');
     }
 
     public function getTemplate()
diff --git a/redaxo/src/addons/structure/plugins/content/lib/cache_template.php b/redaxo/src/addons/structure/plugins/content/lib/cache_template.php
index 74860b0929..35b4e540bc 100644
--- a/redaxo/src/addons/structure/plugins/content/lib/cache_template.php
+++ b/redaxo/src/addons/structure/plugins/content/lib/cache_template.php
@@ -50,11 +50,11 @@ public static function generateKeyMapping(): void
 
     public static function getPath(int $id): string
     {
-        return rex_path::addonCache('templates', $id.'.template');
+        return rex_path::addonCache('structure', 'templates/'.$id.'.template');
     }
 
     public static function getKeyMappingPath(): string
     {
-        return rex_path::addonCache('templates', 'template_key_mapping.cache');
+        return rex_path::addonCache('structure', 'templates/template_key_mapping.cache');
     }
 }