diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index a2f9740779..1fc7aa3146 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -55,10 +55,9 @@ namespace osu.Game.Beatmaps
         public IBindable<WeakReference<BeatmapInfo>> BeatmapRestored => beatmapRestored;
 
         /// <summary>
-        /// A function which populates online information during the import process.
-        /// It is run as the final step of import.
+        /// An online lookup queue component which handles populating online beatmap metadata.
         /// </summary>
-        public Func<BeatmapSetInfo, CancellationToken, Task> PopulateOnlineInformation;
+        public BeatmapOnlineLookupQueue OnlineLookupQueue { private get; set; }
 
         private readonly Bindable<WeakReference<BeatmapInfo>> beatmapRestored = new Bindable<WeakReference<BeatmapInfo>>();
 
@@ -156,8 +155,8 @@ namespace osu.Game.Beatmaps
 
             bool hadOnlineBeatmapIDs = beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0);
 
-            if (PopulateOnlineInformation != null)
-                await PopulateOnlineInformation(beatmapSet, cancellationToken).ConfigureAwait(false);
+            if (OnlineLookupQueue != null)
+                await OnlineLookupQueue.UpdateAsync(beatmapSet, cancellationToken).ConfigureAwait(false);
 
             // ensure at least one beatmap was able to retrieve or keep an online ID, else drop the set ID.
             if (hadOnlineBeatmapIDs && !beatmapSet.Beatmaps.Any(b => b.OnlineBeatmapID > 0))
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index f239119e40..7772d5dfd8 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -138,7 +138,7 @@ namespace osu.Game
 
         private UserLookupCache userCache;
 
-        private BeatmapOnlineLookupQueue onlineBeatmapLookupCache;
+        private BeatmapOnlineLookupQueue onlineBeatmapLookupQueue;
 
         private FileStore fileStore;
 
@@ -246,9 +246,9 @@ namespace osu.Game
             dependencies.Cache(ScoreManager = new ScoreManager(RulesetStore, () => BeatmapManager, Storage, API, contextFactory, Scheduler, Host, () => difficultyCache, LocalConfig));
             dependencies.Cache(BeatmapManager = new BeatmapManager(Storage, contextFactory, RulesetStore, API, Audio, Resources, Host, defaultBeatmap));
 
-            onlineBeatmapLookupCache = new BeatmapOnlineLookupQueue(API, Storage);
+            onlineBeatmapLookupQueue = new BeatmapOnlineLookupQueue(API, Storage);
 
-            BeatmapManager.PopulateOnlineInformation = onlineBeatmapLookupCache.UpdateAsync;
+            BeatmapManager.OnlineLookupQueue = onlineBeatmapLookupQueue;
 
             // this should likely be moved to ArchiveModelManager when another case appears where it is necessary
             // to have inter-dependent model managers. this could be obtained with an IHasForeign<T> interface to
@@ -531,7 +531,7 @@ namespace osu.Game
 
             RulesetStore?.Dispose();
             LocalConfig?.Dispose();
-            onlineBeatmapLookupCache?.Dispose();
+            onlineBeatmapLookupQueue?.Dispose();
 
             contextFactory?.FlushConnections();
         }