Merge "Cache ChangeKind computations"