More changes to caching and change detection.