Fixed oauth reset issues and cached expiry time closes #1180