[Bug 225697] Merge Review: distcache