Merge "UserProperties won't be cached for wrong callers" into main