diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm
index 86fd2c4c1b5..ca5326e010d 100644
--- a/code/modules/power/batteryrack.dm
+++ b/code/modules/power/batteryrack.dm
@@ -11,7 +11,6 @@
 	icon_state = "gsmes"
 	var/cells_amount = 0
 	var/capacitors_amount = 0
-	var/global/list/br_cache = null
 
 /obj/machinery/power/smes/batteryrack/New()
 	..()
@@ -49,33 +48,15 @@
 /obj/machinery/power/smes/batteryrack/update_icon()
 	overlays.Cut()
 	if(stat & BROKEN)	return
-	
-	if(!br_cache)
-		br_cache.len = 7
-		br_cache[1] = image('icons/obj/power.dmi', "gsmes_outputting")
-		br_cache[2] = image('icons/obj/power.dmi', "gsmes_charging")
-		br_cache[3] = image('icons/obj/power.dmi', "gsmes_overcharge")
-		br_cache[4] = image('icons/obj/power.dmi', "gsmes_og1")
-		br_cache[5] = image('icons/obj/power.dmi', "gsmes_og2")
-		br_cache[6] = image('icons/obj/power.dmi', "gsmes_og3")
-		br_cache[7] = image('icons/obj/power.dmi', "gsmes_og4")
-	
+
 	if (output_attempt)
-		overlays += br_cache[1]
+		overlays += image('icons/obj/power.dmi', "gsmes_outputting")
 	if(inputting)
-		overlays += br_cache[2]
+		overlays += image('icons/obj/power.dmi', "gsmes_charging")
 
 	var/clevel = chargedisplay()
 	if(clevel>0)
-		switch(clevel)
-			if(1)
-				overlays += br_cache[4]
-			if(2)
-				overlays += br_cache[5]
-			if(3)
-				overlays += br_cache[6]
-			if(4)
-				overlays += br_cache[7]
+		overlays += image('icons/obj/power.dmi', "gsmes_og[clevel]")
 	return
 
 
@@ -143,23 +124,15 @@
 	if(stat & BROKEN)	return
 
 	if (output_attempt)
-		overlays += br_cache[1]
+		overlays += image('icons/obj/power.dmi', "gsmes_outputting")
 	if(inputting)
-		overlays += br_cache[2]
+		overlays += image('icons/obj/power.dmi', "gsmes_charging")
 	if (overcharge_percent > 100)
-		overlays += br_cache[3]
+		overlays += image('icons/obj/power.dmi', "gsmes_overcharge")
 	else
 		var/clevel = chargedisplay()
 		if(clevel>0)
-			switch(clevel)
-				if(1)
-					overlays += br_cache[4]
-				if(2)
-					overlays += br_cache[5]
-				if(3)
-					overlays += br_cache[6]
-				if(4)
-					overlays += br_cache[7]
+			overlays += image('icons/obj/power.dmi', "gsmes_og[clevel]")
 	return
 
 //This mess of if-elses and magic numbers handles what happens if the engies don't pay attention and let it eat too much charge