Merge branch 'nd/cache-tree-api-refactor'