Fix oauth_client cascade issues for tokens/codes