Cache merge issues fixed