Merge branch 'jc/read-tree-cache-tree-fix'