#2286 Improve performance of CacheKVStore iterator.
