Bug 1852 - Caching