Merge branch 'jc/cache-tree' into jc/dirwalk-n-cache-tree