improved performance for non-oauth2-requests