Merge branch 'jd/cache-tree-trace-wo-the-repository'

Code cleanup. * jd/cache-tree-trace-wo-the-repository: cache-tree: use index state repository in trace2 calls