Merge "Invalidate NN interface objects on cache mismatch"