diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
index 386fadc0d3..6ae0a80123 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
@@ -30,6 +30,7 @@ namespace osu.Game.Tests.Visual.SongSelect
 
         private readonly FailableLeaderboard leaderboard;
 
+        [Cached]
         private readonly DialogOverlay dialogOverlay;
 
         public TestSceneBeatmapLeaderboard()
@@ -39,13 +40,13 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Depth = -1
             });
 
-            leaderboard = new FailableLeaderboard
+            Add(leaderboard = new FailableLeaderboard
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
                 Size = new Vector2(550f, 450f),
                 Scope = BeatmapLeaderboardScope.Global,
-            };
+            });
 
             AddStep(@"New Scores", newScores);
             AddStep(@"Show personal best", showPersonalBest);
@@ -290,13 +291,5 @@ namespace osu.Game.Tests.Visual.SongSelect
                 PlaceholderState = state;
             }
         }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Dependencies.Cache(dialogOverlay);
-
-            Add(leaderboard);
-        }
     }
 }
diff --git a/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs b/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
index c69626321d..0598324110 100644
--- a/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
+++ b/osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
@@ -17,8 +17,8 @@ namespace osu.Game.Tests.Visual.SongSelect
 {
     public class TestSceneUserTopScoreContainer : OsuTestScene
     {
+        [Cached]
         private readonly DialogOverlay dialogOverlay;
-        private readonly Container container;
 
         public TestSceneUserTopScoreContainer()
         {
@@ -29,7 +29,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                 Depth = -1
             });
 
-            container = new Container
+            Add(new Container
             {
                 Origin = Anchor.BottomCentre,
                 Anchor = Anchor.Centre,
@@ -48,7 +48,7 @@ namespace osu.Game.Tests.Visual.SongSelect
                         Anchor = Anchor.BottomCentre,
                     }
                 }
-            };
+            });
 
             var scores = new[]
             {
@@ -124,13 +124,5 @@ namespace osu.Game.Tests.Visual.SongSelect
             AddStep(@"Add score(rank 22333)", () => topScoreContainer.Score.Value = scores[2]);
             AddStep(@"Add null score", () => topScoreContainer.Score.Value = null);
         }
-
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Dependencies.Cache(dialogOverlay);
-
-            Add(container);
-        }
     }
 }
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
index 2369b22ec2..de10eaccca 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
@@ -34,6 +34,7 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private readonly FailableLeaderboard leaderboard;
 
+        [Cached]
         private readonly DialogOverlay dialogOverlay;
 
         public TestSceneDeleteLocalScore()
@@ -43,7 +44,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                 Depth = -1
             });
 
-            leaderboard = new FailableLeaderboard
+            Add(leaderboard = new FailableLeaderboard
             {
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
@@ -64,7 +65,7 @@ namespace osu.Game.Tests.Visual.UserInterface
                     },
                     Version = "Insane"
                 },
-            };
+            });
 
             AddStep("Insert Local Scores", reset);
         }
@@ -75,13 +76,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             leaderboard.RefreshScores();
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            Dependencies.Cache(dialogOverlay);
-            Add(leaderboard);
-        }
-
         private class FailableLeaderboard : BeatmapLeaderboard
         {
             private List<ScoreInfo> scoreList;
@@ -145,7 +139,8 @@ namespace osu.Game.Tests.Visual.UserInterface
 
         private class TestLeaderboardScore : LeaderboardScore
         {
-            private DialogOverlay dialogOverlay;
+            [Resolved]
+            private DialogOverlay dialogOverlay { get; set; }
 
             private readonly FailableLeaderboard leaderboard;
 
@@ -159,12 +154,6 @@ namespace osu.Game.Tests.Visual.UserInterface
             {
                 dialogOverlay?.Push(new TestLocalScoreDeleteDialog(score, leaderboard));
             }
-
-            [BackgroundDependencyLoader]
-            private void load(DialogOverlay dialogOverlay)
-            {
-                this.dialogOverlay = dialogOverlay;
-            }
         }
 
         private class TestLocalScoreDeleteDialog : PopupDialog
diff --git a/osu.Game/Online/Leaderboards/LeaderboardScore.cs b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
index b49a8bf483..7e24dc990b 100644
--- a/osu.Game/Online/Leaderboards/LeaderboardScore.cs
+++ b/osu.Game/Online/Leaderboards/LeaderboardScore.cs
@@ -55,7 +55,8 @@ namespace osu.Game.Online.Leaderboards
 
         private List<ScoreComponentLabel> statisticsLabels;
 
-        private DialogOverlay dialogOverlay;
+        [Resolved]
+        private DialogOverlay dialogOverlay { get; set; }
 
         public LeaderboardScore(ScoreInfo score, int rank, bool allowHighlight = true)
         {
@@ -68,10 +69,9 @@ namespace osu.Game.Online.Leaderboards
         }
 
         [BackgroundDependencyLoader]
-        private void load(IAPIProvider api, OsuColour colour, DialogOverlay overlay)
+        private void load(IAPIProvider api, OsuColour colour)
         {
             var user = score.User;
-            dialogOverlay = overlay;
 
             statisticsLabels = GetStatistics(score).Select(s => new ScoreComponentLabel(s)).ToList();
 
diff --git a/osu.Game/Screens/Select/BeatmapClearScoresDialog.cs b/osu.Game/Screens/Select/BeatmapClearScoresDialog.cs
index c9b6ca7bb3..b32416b361 100644
--- a/osu.Game/Screens/Select/BeatmapClearScoresDialog.cs
+++ b/osu.Game/Screens/Select/BeatmapClearScoresDialog.cs
@@ -14,7 +14,8 @@ namespace osu.Game.Screens.Select
 {
     public class BeatmapClearScoresDialog : PopupDialog
     {
-        private ScoreManager scoreManager;
+        [Resolved]
+        private ScoreManager scoreManager { get; set; }
 
         public BeatmapClearScoresDialog(BeatmapInfo beatmap, Action onCompletion)
         {
@@ -38,11 +39,5 @@ namespace osu.Game.Screens.Select
                 },
             };
         }
-
-        [BackgroundDependencyLoader]
-        private void load(ScoreManager scoreManager)
-        {
-            this.scoreManager = scoreManager;
-        }
     }
 }
diff --git a/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs b/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs
index 514c5adf95..c1d680fd45 100644
--- a/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs
+++ b/osu.Game/Screens/Select/LocalScoreDeleteDialog.cs
@@ -11,7 +11,8 @@ namespace osu.Game.Screens.Select
 {
     public class LocalScoreDeleteDialog : PopupDialog
     {
-        private ScoreManager scoreManager;
+        [Resolved]
+        private ScoreManager scoreManager { get; set; }
 
         public LocalScoreDeleteDialog(ScoreInfo score)
         {
@@ -35,11 +36,5 @@ namespace osu.Game.Screens.Select
                 },
             };
         }
-
-        [BackgroundDependencyLoader]
-        private void load(ScoreManager scoreManager)
-        {
-            this.scoreManager = scoreManager;
-        }
     }
 }