diff --git a/beacon_chain/beacon_chain_db.nim b/beacon_chain/beacon_chain_db.nim
index 4c3e716b6..fccddd49c 100644
--- a/beacon_chain/beacon_chain_db.nim
+++ b/beacon_chain/beacon_chain_db.nim
@@ -1135,8 +1135,7 @@ proc getStateOnlyMutableValidators(
       assign(
         dstValidator.withdrawal_credentials,
         immutableValidators[i].withdrawal_credentials)
-
-    output.validators.resetCache()
+      output.validators.clearCaches(i)
 
     true
   of GetResult.notFound:
@@ -1173,8 +1172,7 @@ proc getStateOnlyMutableValidators(
       assign(
         dstValidator.withdrawal_credentials,
         immutableValidators[i].withdrawal_credentials)
-
-    output.validators.resetCache()
+      output.validators.clearCaches(i)
 
     true
   of GetResult.notFound:
@@ -1208,8 +1206,7 @@ proc getStateOnlyMutableValidators(
       # Bypass hash cache invalidation
       let dstValidator = addr output.validators.data[i]
       assign(dstValidator.pubkey, immutableValidators[i].pubkey.toPubKey())
-
-    output.validators.resetCache()
+      output.validators.clearCaches(i)
 
     true
   of GetResult.notFound: