Add block caching back in