diff --git a/src/c3nav/editor/models/changeset.py b/src/c3nav/editor/models/changeset.py
index d38ca5b4..bc002fac 100644
--- a/src/c3nav/editor/models/changeset.py
+++ b/src/c3nav/editor/models/changeset.py
@@ -423,7 +423,7 @@ class ChangeSet(models.Model):
 
     @property
     def cache_key_by_changes(self):
-        return ':'.join((str(self.pk), MapUpdate.cache_key(), self.last_change_cache_key))
+        return ':'.join(('editor:changeset', str(self.pk), MapUpdate.cache_key(), self.last_change_cache_key))
 
     def get_absolute_url(self):
         if self.pk is None:
diff --git a/src/c3nav/editor/views/changes.py b/src/c3nav/editor/views/changes.py
index 0bbbc967..01a1aacd 100644
--- a/src/c3nav/editor/views/changes.py
+++ b/src/c3nav/editor/views/changes.py
@@ -170,7 +170,7 @@ def changeset_detail(request, pk):
         'active': active,
     }
 
-    cache_key = 'editor:changeset_view_data:'+changeset.cache_key_by_changes
+    cache_key = changeset.cache_key_by_changes + ':view_data'
     changed_objects_data = cache.get(cache_key)
     if changed_objects_data:
         ctx['changed_objects'] = changed_objects_data