Merge branch 'tr/cache-tree'