BAC-188: add caching