Further enhancements to caching as well as diagnostics.