Roni | BSHR-268 | Caching implemented