diff --git a/src/engine/devcmd/cmds/InfoCmd.java b/src/engine/devcmd/cmds/InfoCmd.java
index 44688007..56e39c31 100644
--- a/src/engine/devcmd/cmds/InfoCmd.java
+++ b/src/engine/devcmd/cmds/InfoCmd.java
@@ -515,7 +515,7 @@ public class InfoCmd extends AbstractDevCmd {
                 output += StringUtils.addWS("Qty: "
                         + df.format(item.getNumOfItems()), 20);
                 output += "Charges: " + (byte) item.chargesRemaining
-                        + '/' + item.template.item_initial_charges;
+                        + '/' + item.template.cacheTemplate.getItemInitialCharges();
                 output += newline;
                 output += "Name: " + template.cacheTemplate.getItemBaseName();
                 output += newline;
diff --git a/src/engine/devcmd/cmds/PrintInventoryCmd.java b/src/engine/devcmd/cmds/PrintInventoryCmd.java
index dca30d3a..9347f64d 100644
--- a/src/engine/devcmd/cmds/PrintInventoryCmd.java
+++ b/src/engine/devcmd/cmds/PrintInventoryCmd.java
@@ -80,7 +80,7 @@ public class PrintInventoryCmd extends AbstractDevCmd {
             if (item.template.cacheTemplate.getItemType().equals(ItemType.GOLD) == false) {
 
                 String chargeInfo = "";
-                int chargeMax = template.item_initial_charges;
+                int chargeMax = template.cacheTemplate.getItemInitialCharges();
 
                 if (chargeMax > 0) {
                     int charges = item.chargesRemaining;
diff --git a/src/engine/net/client/handlers/RepairMsgHandler.java b/src/engine/net/client/handlers/RepairMsgHandler.java
index ec7d48a6..c275470e 100644
--- a/src/engine/net/client/handlers/RepairMsgHandler.java
+++ b/src/engine/net/client/handlers/RepairMsgHandler.java
@@ -85,7 +85,7 @@ public class RepairMsgHandler extends AbstractClientMsgHandler {
             //make sure item is damaged and not destroyed
 
             short dur = (short) toRepair.combat_health_current;
-            short max = (short) toRepair.template.combat_health_full;
+            short max = (short) toRepair.template.cacheTemplate.getCombatHealthFull();
 
             //account for durability modifications
 
diff --git a/src/engine/net/client/handlers/VendorSellMsgHandler.java b/src/engine/net/client/handlers/VendorSellMsgHandler.java
index 1897f24d..8156ab50 100644
--- a/src/engine/net/client/handlers/VendorSellMsgHandler.java
+++ b/src/engine/net/client/handlers/VendorSellMsgHandler.java
@@ -104,7 +104,7 @@ public class VendorSellMsgHandler extends AbstractClientMsgHandler {
 
                 //get goldItem cost to sell
 
-                cost = (int) (sell.template.cacheTemplate.getItemValue() * (sell.combat_health_current / sell.template.combat_health_full));
+                cost = (int) (sell.template.cacheTemplate.getItemValue() * (sell.combat_health_current / sell.template.cacheTemplate.getCombatHealthFull()));
 
                 float bargain = player.getBargain();
                 float profit = npc.getBuyPercent(player) + bargain;
diff --git a/src/engine/objects/CharacterItemManager.java b/src/engine/objects/CharacterItemManager.java
index ab4d190c..60590234 100644
--- a/src/engine/objects/CharacterItemManager.java
+++ b/src/engine/objects/CharacterItemManager.java
@@ -1105,7 +1105,7 @@ public class CharacterItemManager {
 
                 // Reset value
 
-                purchasedItem.value = (int) (purchasedItem.template.cacheTemplate.getItemValue() * (purchasedItem.combat_health_current / purchasedItem.template.combat_health_full));
+                purchasedItem.value = (int) (purchasedItem.template.cacheTemplate.getItemValue() * (purchasedItem.combat_health_current / purchasedItem.template.cacheTemplate.getCombatHealthFull()));
                 purchasedItem.magicValue = purchasedItem.template.cacheTemplate.getItemValue() + purchasedItem.calcMagicValue();
 
                 // db transfer successfully, remove from this character
@@ -1932,7 +1932,7 @@ public class CharacterItemManager {
             return;
 
         //don't damage noob gear, hair or beards.
-        if (item.template.combat_health_full == 0)
+        if (item.template.cacheTemplate.getCombatHealthFull() == 0)
             return;
 
         if (!item.isCanDestroy())
diff --git a/src/engine/objects/Item.java b/src/engine/objects/Item.java
index 3bfd46fb..88b7761f 100644
--- a/src/engine/objects/Item.java
+++ b/src/engine/objects/Item.java
@@ -69,12 +69,12 @@ public class Item extends AbstractWorldObject {
         super();
         this.templateID = templateID;
         this.template = ItemTemplate.templates.get(templateID);
-        this.chargesRemaining = this.template.item_initial_charges;
-        this.combat_health_current = this.template.combat_health_full;
+        this.chargesRemaining = this.template.cacheTemplate.getItemInitialCharges();
+        this.combat_health_current = this.template.cacheTemplate.getCombatHealthFull();
         this.equipSlot = EquipSlotType.NONE;
         this.containerType = ItemContainerType.NONE;
         this.numberOfItems = 1;
-        this.flags.addAll(this.template.item_flags);
+        this.flags.addAll(this.template.cacheTemplate.getItemFlags());
         this.value = this.template.cacheTemplate.getItemValue();
         this.magicValue = this.value + calcMagicValue();
         loadTemplateEnchantments();
@@ -238,7 +238,7 @@ public class Item extends AbstractWorldObject {
         writer.putString(item.name); // Unknown. pad?
         writer.put((byte) 1); // End Datablock byte
 
-        writer.putFloat(item.template.combat_health_full);
+        writer.putFloat(item.template.cacheTemplate.getCombatHealthFull());
         writer.putFloat((float) item.combat_health_current);
 
         writer.put((byte) 1); // End Datablock byte
@@ -1116,11 +1116,11 @@ public class Item extends AbstractWorldObject {
         else
             modifiedValue = this.value;
 
-        if (this.template.item_initial_charges > 0)
-            modifiedValue = modifiedValue * (this.chargesRemaining / this.template.item_initial_charges);
+        if (this.template.cacheTemplate.getItemInitialCharges() > 0)
+            modifiedValue = modifiedValue * (this.chargesRemaining / this.template.cacheTemplate.getItemInitialCharges());
 
-        if (this.template.combat_health_full > 0)
-            modifiedValue = (int) (modifiedValue * (this.combat_health_current / this.template.combat_health_full));
+        if (this.template.cacheTemplate.getCombatHealthFull() > 0)
+            modifiedValue = (int) (modifiedValue * (this.combat_health_current / this.template.cacheTemplate.getCombatHealthFull()));
 
         return modifiedValue;
     }