Rework tree/commit cache