Clean up oauth2 and remove custom cache path in test