diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
index 8e522fa715f6..116a3ee1050c 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineControlPointDisplay.cs
@@ -32,10 +32,7 @@ protected override void LoadBeatmap(EditorBeatmap beatmap)
 
             controlPointGroups.UnbindAll();
             controlPointGroups.BindTo(beatmap.ControlPointInfo.Groups);
-            controlPointGroups.BindCollectionChanged((_, _) =>
-            {
-                invalidateGroups();
-            }, true);
+            controlPointGroups.BindCollectionChanged((_, _) => groupCache.Invalidate(), true);
         }
 
         protected override void Update()
@@ -51,19 +48,20 @@ protected override void Update()
             if (visibleRange != newRange)
             {
                 visibleRange = newRange;
-                invalidateGroups();
+                groupCache.Invalidate();
             }
 
             if (!groupCache.IsValid)
+            {
                 recreateDrawableGroups();
+                groupCache.Validate();
+            }
         }
 
-        private void invalidateGroups() => groupCache.Invalidate();
-
         private void recreateDrawableGroups()
         {
             // Remove groups outside the visible range
-            foreach (var drawableGroup in this)
+            foreach (TimelineControlPointGroup drawableGroup in this)
             {
                 if (!shouldBeVisible(drawableGroup.Group))
                     drawableGroup.Expire();
@@ -93,8 +91,6 @@ private void recreateDrawableGroups()
 
                 Add(new TimelineControlPointGroup(group));
             }
-
-            groupCache.Validate();
         }
 
         private bool shouldBeVisible(ControlPointGroup group) => group.Time >= visibleRange.min && group.Time <= visibleRange.max;