1903: fixed issue
1903: simplified caching handling and caching invalidation
Merge branch 'staging' into i-1903