diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index b48e25f1fe..1e175ff8c4 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -110,7 +110,7 @@ private void load(FrameworkConfigManager frameworkConfig)
                 Task.Run(() => BeatmapManager.Import(paths.ToArray()));
             }
 
-            dependencies.Cache(this);
+            dependencies.CacheAs<OsuGame>(this);
 
             configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset);
             Ruleset.Value = RulesetStore.GetRuleset(configRuleset.Value) ?? RulesetStore.AvailableRulesets.First();
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index ef02f1a7ec..8b317ca59a 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -93,7 +93,7 @@ private void load()
 
             dependencies.Cache(new LargeTextureStore(new RawTextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures"))));
 
-            dependencies.Cache(this);
+            dependencies.CacheAs<OsuGameBase>(this);
             dependencies.Cache(LocalConfig);
 
             runMigrations();
@@ -112,7 +112,7 @@ private void load()
             dependencies.Cache(new OsuColour());
 
             //this completely overrides the framework default. will need to change once we make a proper FontStore.
-            dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 100 }, true);
+            dependencies.Cache(Fonts = new FontStore { ScaleAdjust = 100 });
 
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/FontAwesome"));
             Fonts.AddStore(new GlyphStore(Resources, @"Fonts/osuFont"));
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 357931b878..79f00cc988 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -181,7 +181,7 @@ protected SongSelect()
         [BackgroundDependencyLoader(permitNulls: true)]
         private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuGame osu, OsuColour colours)
         {
-            dependencies.Cache(this);
+            dependencies.CacheAs<SongSelect>(this);
 
             if (Footer != null)
             {