From 7c9c9f1ce1f062f667ec38e6d2c300332cbfe857 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 13 Aug 2019 17:38:21 +0900
Subject: [PATCH] Simplify caching

---
 .../Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs      | 8 +-------
 osu.Game/Screens/Multi/Match/MatchSubScreen.cs            | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
index f148170847..68ad0b42b4 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchBeatmapPanel.cs
@@ -13,6 +13,7 @@ using osu.Framework.Allocation;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
+    [Cached(typeof(IPreviewTrackOwner))]
     public class TestSceneMatchBeatmapPanel : MultiplayerTestScene, IPreviewTrackOwner
     {
         public override IReadOnlyList<Type> RequiredTypes => new[]
@@ -48,12 +49,5 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 previewTrackManager.StopAnyPlaying(this);
             });
         }
-
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-            dependencies.CacheAs<IPreviewTrackOwner>(this);
-            return dependencies;
-        }
     }
 }
diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
index ea7a713e0e..f3e10db444 100644
--- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
+++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs
@@ -19,6 +19,7 @@ using PlaylistItem = osu.Game.Online.Multiplayer.PlaylistItem;
 
 namespace osu.Game.Screens.Multi.Match
 {
+    [Cached(typeof(IPreviewTrackOwner))]
     public class MatchSubScreen : MultiplayerSubScreen, IPreviewTrackOwner
     {
         public override bool DisallowExternalBeatmapRulesetChanges => true;
@@ -237,13 +238,6 @@ namespace osu.Game.Screens.Multi.Match
             }
         }
 
-        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
-        {
-            var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
-            dependencies.CacheAs<IPreviewTrackOwner>(this);
-            return dependencies;
-        }
-
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);