drc: rework invalidation yet more