1903: simplified caching handling and caching invalidation