diff --git a/src/Modules/CalcSetup.lua b/src/Modules/CalcSetup.lua
index bb2db8819a..acf01e34d2 100644
--- a/src/Modules/CalcSetup.lua
+++ b/src/Modules/CalcSetup.lua
@@ -1189,7 +1189,7 @@ function calcs.initEnv(build, mode, override, specEnv)
 		end
 
 		-- Determine main skill group
-		if env.mode == "CALCS" then
+		if env.mode == "CALCS" or env.mode == "CACHE" then
 			env.calcsInput.skill_number = m_min(m_max(#build.skillsTab.socketGroupList, 1), env.calcsInput.skill_number or 1)
 			env.mainSocketGroup = env.calcsInput.skill_number
 		else