CON-754: Removed caching