Merge branch 'jc/cache-tree' into next