Cache users differently than 2.3