diff --git a/src/Data/ModCache.lua b/src/Data/ModCache.lua
index c73cd79b0f..f2bce6d319 100755
--- a/src/Data/ModCache.lua
+++ b/src/Data/ModCache.lua
@@ -8068,6 +8068,7 @@ c["Corpses you Spawn have 5% increased Maximum Life"]={{[1]={flags=0,keywordFlag
 c["Corrupted"]={nil,"Corrupted "}
 c["Corrupted Blood cannot be inflicted on you"]={{[1]={flags=0,keywordFlags=0,name="CorruptedBloodImmune",type="FLAG",value=true}},nil}
 c["Corrupted Soul"]={{[1]={flags=0,keywordFlags=0,name="Keystone",type="LIST",value="Corrupted Soul"}},nil}
+c["Cost every fifth time you Pay it"]={nil,"Cost every fifth time you Pay it "}
 c["Count as Blocking Attack Damage from the first target Hit with each Shield Attack"]={nil,"Count as Blocking Attack Damage from the first target Hit with each Shield Attack "}
 c["Count as having maximum number of Endurance Charges"]={{[1]={flags=0,keywordFlags=0,name="HaveMaximumEnduranceCharges",type="FLAG",value=true}},nil}
 c["Count as having maximum number of Frenzy Charges"]={{[1]={flags=0,keywordFlags=0,name="HaveMaximumFrenzyCharges",type="FLAG",value=true}},nil}
@@ -11885,6 +11886,8 @@ c["Spells Cost +8% of Life"]={{[1]={[1]={floor=true,percent=8,stat="Life",type="
 c["Spells Triggered this way have 150% more Cost"]={nil,"Spells Triggered this way have 150% more Cost "}
 c["Spells Triggered this way have 150% more Cost +28% to Fire Damage over Time Multiplier"]={{},"Spells Triggered this way have 150% more % to Fire Damage over Time Multiplier "}
 c["Spells cast by Totems deal 25% increased Damage"]={{[1]={flags=2,keywordFlags=16384,name="Damage",type="INC",value=25}},nil}
+c["Spells cause you to gain Energy Shield equal to their Upfront"]={nil,"Spells cause you to gain Energy Shield equal to their Upfront "}
+c["Spells cause you to gain Energy Shield equal to their Upfront Cost every fifth time you Pay it"]={nil,"Spells cause you to gain Energy Shield equal to their Upfront Cost every fifth time you Pay it "}
 c["Spells deal added Chaos Damage equal to 18% of your maximum Life"]={{[1]={[1]={percent=18,stat="Life",type="PercentStat"},[2]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="ChaosMin",type="BASE",value=1},[2]={[1]={percent=18,stat="Life",type="PercentStat"},[2]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="ChaosMax",type="BASE",value=1}},nil}
 c["Spells deal added Chaos Damage equal to 2% of your maximum Life"]={{[1]={[1]={percent=2,stat="Life",type="PercentStat"},[2]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="ChaosMin",type="BASE",value=1},[2]={[1]={percent=2,stat="Life",type="PercentStat"},[2]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="ChaosMax",type="BASE",value=1}},nil}
 c["Spells deal added Chaos Damage equal to 20% of your maximum Life"]={{[1]={[1]={percent=20,stat="Life",type="PercentStat"},[2]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="ChaosMin",type="BASE",value=1},[2]={[1]={percent=20,stat="Life",type="PercentStat"},[2]={skillType=2,type="SkillType"},flags=0,keywordFlags=0,name="ChaosMax",type="BASE",value=1}},nil}
diff --git a/src/Data/Uniques/ring.lua b/src/Data/Uniques/ring.lua
index bfbf1a97ea..c91a54bd25 100644
--- a/src/Data/Uniques/ring.lua
+++ b/src/Data/Uniques/ring.lua
@@ -1280,12 +1280,13 @@ Immune to Chill
 ]],[[
 Tawhanuku's Timing
 Moonstone Ring
-{tags:caster}50% chance to Trigger Socketed Spells when you Spend at least 100 Mana on an
-{tags:caster}Upfront Cost to Use or Trigger a Skill, with a 0.1 second Cooldown
-{tags:caster}(30-40)% increased Spell Damage
+Implicits: 1
 {tags:defences}+(15-25) to maximum Energy Shield
+{tags:caster}(30-40)% increased Spell Damage
 {tags:resource}+(60-80) to maximum Mana
 (5-10)% chance to Freeze, Shock and Ignite
+{tags:defences,caster}Spells cause you to gain Energy Shield equal to their Upfront
+{tags:defences,caster}Cost every fifth time you Pay it
 ]],[[
 Thief's Torment
 Prismatic Ring
diff --git a/src/Export/Uniques/ring.lua b/src/Export/Uniques/ring.lua
index cdd86edfd8..51d37dec1a 100644
--- a/src/Export/Uniques/ring.lua
+++ b/src/Export/Uniques/ring.lua
@@ -1262,11 +1262,12 @@ AddedColdDamageAgainstFrozenEnemiesUnique__2
 ]],[[
 Tawhanuku's Timing
 Moonstone Ring
+Implicits: 1
 IncreasedEnergyShieldImplicitRing1
 SpellDamageUnique__16
 IncreasedManaUnique__27
 ChanceToFreezeShockIgniteUnique__3
-ChanceToCastOnManaSpentUnique__1
+GainSpellCostAsESUnique__1
 ]],[[
 Thief's Torment
 Prismatic Ring