diff --git a/app/main/views/platform_admin.py b/app/main/views/platform_admin.py
index ed85cad74..5f051cf10 100644
--- a/app/main/views/platform_admin.py
+++ b/app/main/views/platform_admin.py
@@ -415,8 +415,8 @@ def clear_cache():
         ]),
         ('template', [
             'service-????????-????-????-????-????????????-templates',
-            'template-????????-????-????-????-????????????-version-*',
-            'template-????????-????-????-????-????????????-versions',
+            'service-????????-????-????-????-????????????-template-????????-????-????-????-????????????-version-*',
+            'service-????????-????-????-????-????????????-template-????????-????-????-????-????????????-versions',
         ]),
         ('email_branding', [
             'email_branding',
diff --git a/app/notify_client/template_folder_api_client.py b/app/notify_client/template_folder_api_client.py
index 4755cfca2..005e82898 100644
--- a/app/notify_client/template_folder_api_client.py
+++ b/app/notify_client/template_folder_api_client.py
@@ -49,10 +49,7 @@ class TemplateFolderAPIClient(NotifyAdminAPIClient):
         })
 
         if template_ids:
-            redis_client.delete(*map(
-                'template-{}-version-None'.format,
-                template_ids,
-            ))
+            redis_client.delete(*(f'service-{service_id}-template-{id}-version-None' for id in template_ids))
 
     @cache.delete('service-{service_id}-template-folders')
     def update_template_folder(self, service_id, template_folder_id, name, users_with_permission=None):
diff --git a/tests/app/main/views/test_platform_admin.py b/tests/app/main/views/test_platform_admin.py
index 811eadc0c..c75bab7e8 100644
--- a/tests/app/main/views/test_platform_admin.py
+++ b/tests/app/main/views/test_platform_admin.py
@@ -690,8 +690,8 @@ def test_clear_cache_shows_form(client_request, platform_admin_user, mocker):
 @pytest.mark.parametrize('model_type, expected_calls, expected_confirmation', (
     ('template', [
         call('service-????????-????-????-????-????????????-templates'),
-        call('template-????????-????-????-????-????????????-version-*'),
-        call('template-????????-????-????-????-????????????-versions'),
+        call('service-????????-????-????-????-????????????-template-????????-????-????-????-????????????-version-*'),
+        call('service-????????-????-????-????-????????????-template-????????-????-????-????-????????????-versions'),
     ], 'Removed 3 template objects from redis'),
     ('service', [
         call('has_jobs-????????-????-????-????-????????????'),
diff --git a/tests/app/notify_client/test_template_folder_client.py b/tests/app/notify_client/test_template_folder_client.py
index f1b8726e1..275bb8a4e 100644
--- a/tests/app/notify_client/test_template_folder_client.py
+++ b/tests/app/notify_client/test_template_folder_client.py
@@ -74,9 +74,9 @@ def test_move_templates_and_folders(mocker):
     )
     assert mock_redis_delete.call_args_list == [
         call(
-            'template-a-version-None',
-            'template-b-version-None',
-            'template-c-version-None',
+            f'service-{some_service_id}-template-a-version-None',
+            f'service-{some_service_id}-template-b-version-None',
+            f'service-{some_service_id}-template-c-version-None',
         ),
         call('service-{}-templates'.format(some_service_id)),
         call('service-{}-template-folders'.format(some_service_id)),