CON-751: Added message
CON-751: Added caching layer