diff --git a/state/kvcache.go b/state/kvcache.go
index 6fcb176f33..25ec29f9e6 100644
--- a/state/kvcache.go
+++ b/state/kvcache.go
@@ -131,7 +131,8 @@ func (c *MemKVCache) Commit(sub SimpleDB) error {
 
 // applyCache will apply all the cache methods to the underlying store
 func (c *MemKVCache) applyCache() {
-	for k, v := range c.cache.m {
+	for _, k := range c.cache.keysInRange(nil, nil) {
+		v := c.cache.m[k]
 		if v == nil {
 			c.store.Remove([]byte(k))
 		} else {