Block: cache - remember context
Merge pull request #180 from rmsint/block_cache_remember_context

Block: cache - remember context