Changes for testing cache stores with many entries