Merge branch 'mh/simplify-cache-tree-find'