Rework caching of data blocks to eliminate double-caching.