Duplicate ID cache clean-up

For 2.3.x.