Caching updates

commit-by-commit