Re #1006: Caching mechanism implementation
Re #1006: Cahcing mechanism implementation