diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs
index 1f45274035..4c7b5b8eb9 100644
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -85,6 +85,7 @@ namespace OpenRA
 
 		readonly IRenderModifier[] renderModifiers;
 		readonly IRender[] renders;
+		readonly IDisable[] disables;
 
 		internal Actor(World world, string name, TypeDictionary initDict)
 		{
@@ -128,6 +129,7 @@ namespace OpenRA
 
 			renderModifiers = TraitsImplementing<IRenderModifier>().ToArray();
 			renders = TraitsImplementing<IRender>().ToArray();
+			disables = TraitsImplementing<IDisable>().ToArray();
 		}
 
 		public void Tick()
@@ -277,6 +279,14 @@ namespace OpenRA
 			health.Value.InflictDamage(this, attacker, health.Value.MaxHP, null, true);
 		}
 
+		public bool IsDisabled()
+		{
+			foreach (var disable in disables)
+				if (disable.Disabled)
+					return true;
+			return false;
+		}
+
 		#region Scripting interface
 
 		Lazy<ScriptActorInterface> luaInterface;
diff --git a/OpenRA.Game/Traits/CreatesShroud.cs b/OpenRA.Game/Traits/CreatesShroud.cs
index 6adcb682aa..2b6a28b5fc 100644
--- a/OpenRA.Game/Traits/CreatesShroud.cs
+++ b/OpenRA.Game/Traits/CreatesShroud.cs
@@ -37,7 +37,7 @@ namespace OpenRA.Traits
 			if (lobbyShroudFogDisabled)
 				return;
 
-			var disabled = self.TraitsImplementing<IDisable>().Any(d => d.Disabled);
+			var disabled = self.IsDisabled();
 			if (cachedLocation != self.Location || cachedDisabled != disabled)
 			{
 				cachedLocation = self.Location;
diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
index 015632cef0..253ddc38dc 100644
--- a/OpenRA.Game/Traits/TraitsInterfaces.cs
+++ b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -329,14 +329,6 @@ namespace OpenRA.Traits
 		void OnObjectiveFailed(Player player, int objectiveID);
 	}
 
-	public static class DisableExts
-	{
-		public static bool IsDisabled(this Actor a)
-		{
-			return a.TraitsImplementing<IDisable>().Any(d => d.Disabled);
-		}
-	}
-
 	public interface ILegacyEditorRenderInfo
 	{
 		string EditorPalette { get; }
diff --git a/OpenRA.Mods.Common/Traits/Render/RenderBuilding.cs b/OpenRA.Mods.Common/Traits/Render/RenderBuilding.cs
index fce74db005..f5a36c0daf 100644
--- a/OpenRA.Mods.Common/Traits/Render/RenderBuilding.cs
+++ b/OpenRA.Mods.Common/Traits/Render/RenderBuilding.cs
@@ -54,11 +54,8 @@ namespace OpenRA.Mods.Common.Traits
 			DefaultAnimation.PlayRepeating(NormalizeSequence(self, info.Sequence));
 
 			if (info.PauseOnLowPower)
-			{
-				var disabled = self.TraitsImplementing<IDisable>();
-				DefaultAnimation.Paused = () => disabled.Any(d => d.Disabled)
-					&& DefaultAnimation.CurrentSequence.Name == NormalizeSequence(self, info.Sequence);
-			}
+				DefaultAnimation.Paused = () =>
+					self.IsDisabled() && DefaultAnimation.CurrentSequence.Name == NormalizeSequence(self, info.Sequence);
 		}
 
 		public void PlayCustomAnimThen(Actor self, string name, Action a)
diff --git a/OpenRA.Mods.Common/Traits/Render/WithActiveAnimation.cs b/OpenRA.Mods.Common/Traits/Render/WithActiveAnimation.cs
index a372ee24d9..6a4d93cd75 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithActiveAnimation.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithActiveAnimation.cs
@@ -30,13 +30,11 @@ namespace OpenRA.Mods.Common.Traits
 
 	public class WithActiveAnimation : ITick, INotifyBuildComplete, INotifySold
 	{
-		readonly IEnumerable<IDisable> disabled;
 		readonly WithActiveAnimationInfo info;
 		readonly RenderBuilding renderBuilding;
 
 		public WithActiveAnimation(Actor self, WithActiveAnimationInfo info)
 		{
-			disabled = self.TraitsImplementing<IDisable>();
 			renderBuilding = self.Trait<RenderBuilding>();
 			this.info = info;
 		}
@@ -49,7 +47,7 @@ namespace OpenRA.Mods.Common.Traits
 
 			if (--ticks <= 0)
 			{
-				if (!(info.PauseOnLowPower && disabled.Any(d => d.Disabled)))
+				if (!(info.PauseOnLowPower && self.IsDisabled()))
 					renderBuilding.PlayCustomAnim(self, info.Sequence);
 				ticks = info.Interval;
 			}
diff --git a/OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs b/OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
index 41d427f999..75b381cdd8 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
@@ -61,7 +61,6 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			var rs = self.Trait<RenderSprites>();
 			var body = self.Trait<IBodyOrientation>();
-			var disabled = self.TraitsImplementing<IDisable>();
 
 			buildComplete = !self.HasTrait<Building>(); // always render instantly for units
 			overlay = new Animation(self.World, rs.GetImage(self));
@@ -70,7 +69,7 @@ namespace OpenRA.Mods.Common.Traits
 				new AnimationWithOffset(overlay,
 					() => body.LocalToWorld(info.Offset.Rotate(body.QuantizeOrientation(self, self.Orientation))),
 					() => IsTraitDisabled || !buildComplete,
-					() => info.PauseOnLowPower && disabled.Any(d => d.Disabled),
+					() => info.PauseOnLowPower && self.IsDisabled(),
 					p => WithTurret.ZOffsetFromCenter(self, p, 1)),
 				info.Palette, info.IsPlayerPalette);
 		}
diff --git a/OpenRA.Mods.Common/Traits/Render/WithRepairAnimation.cs b/OpenRA.Mods.Common/Traits/Render/WithRepairAnimation.cs
index 7acfa409fa..d38612c4f6 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithRepairAnimation.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithRepairAnimation.cs
@@ -27,19 +27,17 @@ namespace OpenRA.Mods.Common.Traits
 
 	public class WithRepairAnimation : INotifyRepair
 	{
-		IEnumerable<IDisable> disabled;
 		WithRepairAnimationInfo info;
 
 		public WithRepairAnimation(Actor self, WithRepairAnimationInfo info)
 		{
-			disabled = self.TraitsImplementing<IDisable>();
 			this.info = info;
 		}
 
 		public void Repairing(Actor self, Actor host)
 		{
 			var building = host.TraitOrDefault<RenderBuilding>();
-			if (building != null && !(info.PauseOnLowPower && disabled.Any(d => d.Disabled)))
+			if (building != null && !(info.PauseOnLowPower && self.IsDisabled()))
 				building.PlayCustomAnim(host, info.Sequence);
 		}
 	}
diff --git a/OpenRA.Mods.Common/Traits/Render/WithRepairOverlay.cs b/OpenRA.Mods.Common/Traits/Render/WithRepairOverlay.cs
index 205ed29758..92746f31f1 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithRepairOverlay.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithRepairOverlay.cs
@@ -44,7 +44,6 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			var rs = self.Trait<RenderSprites>();
 			var body = self.Trait<IBodyOrientation>();
-			var disabled = self.TraitsImplementing<IDisable>();
 
 			buildComplete = !self.HasTrait<Building>(); // always render instantly for units
 			overlay = new Animation(self.World, rs.GetImage(self));
@@ -53,7 +52,7 @@ namespace OpenRA.Mods.Common.Traits
 				new AnimationWithOffset(overlay,
 					() => body.LocalToWorld(info.Offset.Rotate(body.QuantizeOrientation(self, self.Orientation))),
 					() => !buildComplete,
-					() => info.PauseOnLowPower && disabled.Any(d => d.Disabled),
+					() => info.PauseOnLowPower && self.IsDisabled(),
 					p => WithTurret.ZOffsetFromCenter(self, p, 1)),
 				info.Palette, info.IsPlayerPalette);
 		}
diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
index 6f49b1c926..7c9dafe0c4 100644
--- a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
+++ b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs
@@ -179,7 +179,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		static bool InstanceDisabled(SupportPower sp)
 		{
-			return sp.Self.TraitsImplementing<IDisable>().Any(d => d.Disabled);
+			return sp.Self.IsDisabled();
 		}
 
 		bool notifiedCharging;