Merge "dscpPolicy: assume cache lookup always succeeds (though it might miss)" into main