Modified the way storage is handled in the block-level cache
naive lru caching broke the tests
merge