#master: caching layer added