Merge pull request #182 from WouterJ/revert_181

Reverted commit 9795d68
Block: cache - remember context
Merge pull request #180 from rmsint/block_cache_remember_context

Block: cache - remember context
Added more formats