Merge branch 'cache_consistency'