diff --git a/MediaBrowser.Controller/Entities/Audio/Artist.cs b/MediaBrowser.Controller/Entities/Audio/Artist.cs
index 15bdefb02a..5e14b01529 100644
--- a/MediaBrowser.Controller/Entities/Audio/Artist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Artist.cs
@@ -20,7 +20,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         }
 
         public string LastFmImageUrl { get; set; }
-        
+
         /// <summary>
         /// Gets the user data key.
         /// </summary>
@@ -76,9 +76,9 @@ namespace MediaBrowser.Controller.Entities.Audio
 
             if (!string.IsNullOrEmpty(id))
             {
-                return id;
+                return "Artist-Musicbrainz-" + id;
             }
-            
+
             return "Artist-" + item.Name;
         }
     }
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index 86a466402a..13b33c6379 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -114,15 +114,14 @@ namespace MediaBrowser.Controller.Entities.Audio
 
             if (parent != null)
             {
-                var id = parent.GetProviderId(MetadataProviders.MusicBrainzReleaseGroup) ??
-                         parent.GetProviderId(MetadataProviders.Musicbrainz);
+                var parentKey = parent.GetUserDataKey();
 
-                if (!string.IsNullOrEmpty(id) && IndexNumber.HasValue)
+                if (IndexNumber.HasValue)
                 {
                     var songKey = (ParentIndexNumber != null ? ParentIndexNumber.Value.ToString("0000 - ") : "")
                                   + (IndexNumber.Value.ToString("0000 - "));
 
-                    return id + songKey;
+                    return parentKey + songKey;
                 }
             }
 
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index e4543222c9..b96cd625fe 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -86,14 +86,14 @@ namespace MediaBrowser.Controller.Entities.Audio
 
             if (!string.IsNullOrEmpty(id))
             {
-                return id;
+                return "MusicAlbum-MusicBrainzReleaseGroup-" + id;
             }
 
             id = this.GetProviderId(MetadataProviders.Musicbrainz);
 
             if (!string.IsNullOrEmpty(id))
             {
-                return id;
+                return "MusicAlbum-Musicbrainz-" + id;
             }
 
             return base.GetUserDataKey();
diff --git a/MediaBrowser.Controller/Entities/Game.cs b/MediaBrowser.Controller/Entities/Game.cs
index a71cfe34a7..8a33eeb86f 100644
--- a/MediaBrowser.Controller/Entities/Game.cs
+++ b/MediaBrowser.Controller/Entities/Game.cs
@@ -72,7 +72,13 @@ namespace MediaBrowser.Controller.Entities
 
         public override string GetUserDataKey()
         {
-            return this.GetProviderId(MetadataProviders.Gamesdb) ?? base.GetUserDataKey();
+            var id = this.GetProviderId(MetadataProviders.Gamesdb);
+
+            if (!string.IsNullOrEmpty(id))
+            {
+                return "Game-Gamesdb-" + id;
+            }
+            return base.GetUserDataKey();
         }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/GameSystem.cs b/MediaBrowser.Controller/Entities/GameSystem.cs
index c568dda129..054071b351 100644
--- a/MediaBrowser.Controller/Entities/GameSystem.cs
+++ b/MediaBrowser.Controller/Entities/GameSystem.cs
@@ -32,7 +32,11 @@ namespace MediaBrowser.Controller.Entities
         /// <returns>System.String.</returns>
         public override string GetUserDataKey()
         {
-            return GameSystemName ?? base.GetUserDataKey();
+            if (!string.IsNullOrEmpty(GameSystemName))
+            {
+                return "GameSystem-" + GameSystemName;
+            }
+            return base.GetUserDataKey();
         }
     }
 }