Issue #476 - Caching