diff --git a/game/resource/English/modifier/items/modifier_charge_replenishing.txt b/game/resource/English/modifier/items/modifier_charge_replenishing.txt
new file mode 100644
index 0000000000..ccf59097a7
--- /dev/null
+++ b/game/resource/English/modifier/items/modifier_charge_replenishing.txt
@@ -0,0 +1,4 @@
+    //=============================================================================
+    // Generic Charge Replenisher
+    //=============================================================================
+            "DOTA_Tooltip_modifier_charge_replenishing"                          "Replenishing charges"
diff --git a/game/scripts/vscripts/components/cave/cave_types.lua b/game/scripts/vscripts/components/cave/cave_types.lua
index cd5e4c1453..ad85bff640 100644
--- a/game/scripts/vscripts/components/cave/cave_types.lua
+++ b/game/scripts/vscripts/components/cave/cave_types.lua
@@ -1,4 +1,22 @@
 
+local BaseMultipliers = {
+  -- CreepPower:GetPowerForMinute
+
+  --  minute,                                   -- minute
+  --  ((minute / 8) ^ 2 / 75) + 1,              -- hp
+  --  minute,                                   -- mana
+  --  (minute / 20) + 1,                        -- damage
+  --  minute ^ 0.5,                             -- armor
+  --  (minute / 2) + 1,                         -- gold
+  --  ((21 * minute^2 - 19 * minute + 3002) / 3002) * self.numPlayersXPFactor * multFactor -- xp
+  mana = function (k) return CreepPower:GetPowerForMinute(k * 8)[3] end,
+  hp = function (k) return CreepPower:GetPowerForMinute(k * 8)[2] end,
+  damage = function (k) return CreepPower:GetPowerForMinute(k * 8)[4] end,
+  armour = function (k) return CreepPower:GetPowerForMinute(k * 8)[5] end,
+  gold = function (k) return CreepPower:GetPowerForMinute(k * 8)[5] end,
+  exp = function (k) return CreepPower:GetPowerForMinute(k * 8)[6] end
+}
+
 -- "creep name", Health, Mana, Damage, Armor, Gold Bounty, Exp Bounty
 CaveTypes = {
   [1] = { -- 1 "Howl's it Going?"
@@ -16,12 +34,12 @@ CaveTypes = {
         {"npc_dota_neutral_alpha_wolf",           240,  0,    33,   0,    28,   120},
       },
       multiplier = {
-        mana = function (k) return 1 end,
-        hp = function (k) return 1 end,
-        damage = function (k) return 1 end,
-        armour = function (k) return 1 end,
-        gold = function (k) return (16 * k + 9) / 9 end,
-        exp = function (k) return (168 * k^2 + 2 * k + 15) / 15 end,
+        mana = BaseMultipliers.mana, -- function (k) return 1 end,
+        hp = BaseMultipliers.hp, -- function (k) return 1 end,
+        damage = BaseMultipliers.damage, -- function (k) return 1 end,
+        armour = BaseMultipliers.armour, -- function (k) return 1 end,
+        gold = BaseMultipliers.gold, -- function (k) return (16 * k + 9) / 9 end,
+        exp = BaseMultipliers.exp, -- function (k) return (168 * k^2 + 2 * k + 15) / 15 end,
       }
     }
   },
@@ -40,12 +58,12 @@ CaveTypes = {
         {"npc_dota_neutral_centaur_khan",               1100,    0,  55,   0,  68.4, 123.5},
       },
       multiplier = {
-        mana = function (k) return 1 end,
-        hp = function (k) return 1 end,
-        damage = function (k) return 1 end,
-        armour = function (k) return 1 end,
-        gold = function (k) return (16 * k + 9) / 9 end,
-        exp = function (k) return (84 * k^2 + 43  * k + 13) / 13 end,
+        mana = BaseMultipliers.mana, -- function (k) return 1 end,
+        hp = BaseMultipliers.hp, -- function (k) return 1 end,
+        damage = BaseMultipliers.damage, -- function (k) return 1 end,
+        armour = BaseMultipliers.armour, -- function (k) return 1 end,
+        gold = BaseMultipliers.gold, -- function (k) return (16 * k + 9) / 9 end,
+        exp = BaseMultipliers.exp, -- function (k) return (84 * k^2 + 43  * k + 13) / 13 end,
       }
     }
   },
@@ -62,12 +80,12 @@ CaveTypes = {
         {"npc_dota_neutral_black_drake",      950,      0,  45,   -1,  136.5, 167.25},
       },
       multiplier = {
-        mana = function (k) return 1 end,
-        hp = function (k) return 1 end,
-        damage = function (k) return 1 end,
-        armour = function (k) return 1 end,
-        gold = function (k) return (16 * k + 13) / 13 end,
-        exp = function (k) return (84 * k^2 + 85 * k + 29) / 29 end,
+        mana = BaseMultipliers.mana, -- function (k) return 1 end,
+        hp = BaseMultipliers.hp, -- function (k) return 1 end,
+        damage = BaseMultipliers.damage, -- function (k) return 1 end,
+        armour = BaseMultipliers.armour, -- function (k) return 1 end,
+        gold = BaseMultipliers.gold, -- function (k) return (16 * k + 13) / 13 end,
+        exp = BaseMultipliers.exp, -- function (k) return (84 * k^2 + 85 * k + 29) / 29 end,
       }
     }
   },
@@ -78,12 +96,12 @@ CaveTypes = {
         {"npc_dota_mini_roshan",              5500,   0,    65,   15,   646,  753.5},
       },
       multiplier = {
-        mana = function (k) return 1 end,
-        hp = function (k) return 1 end,
-        damage = function (k) return 1 end,
-        armour = function (k) return 1 end,
+        mana = BaseMultipliers.mana, -- function (k) return 1 end,
+        hp = BaseMultipliers.hp, -- function (k) return 1 end,
+        damage = BaseMultipliers.damage, -- function (k) return 1 end,
+        armour = BaseMultipliers.armour, -- function (k) return 1 end,
         gold = function (k) return 0 end,
-        exp = function (k) return (56 * k^2 + 85 * k + 37) / 37 end,
+        exp = BaseMultipliers.exp, -- function (k) return (56 * k^2 + 85 * k + 37) / 37 end,
       }
     }
   }
diff --git a/game/scripts/vscripts/components/index.lua b/game/scripts/vscripts/components/index.lua
index 93d3871f91..178b57b0ee 100644
--- a/game/scripts/vscripts/components/index.lua
+++ b/game/scripts/vscripts/components/index.lua
@@ -12,4 +12,4 @@ require('components/boss/index')
 require('components/progression/index')
 require('components/sellblacklist/index')
 require('components/courier/index')
-require('components/cave/index')
+require('components/cave/index') -- must be after creeps