Merge part of 'jc/cache-tree'