XD-409: more correct way of copying cached values