CON-999: Added caching