diff --git a/3rdparty b/3rdparty
index 87b53659c4a..96117a5a801 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 87b53659c4a128ce87aa0ffb8c0d830c62655034
+Subproject commit 96117a5a80146c10442c0d7a43ad356b254523d2
diff --git a/lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php b/lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php
index b1478762550..3df1aee090f 100644
--- a/lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php
+++ b/lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php
@@ -25,11 +25,14 @@ declare(strict_types=1);
  */
 namespace OC\Files\ObjectStore;
 
+use OpenStack\Common\Auth\Token;
 use OpenStack\Identity\v2\Service;
 
 class SwiftV2CachingAuthService extends Service {
 	public function authenticate(array $options = []): array {
-		if (!empty($options['v2cachedToken'])) {
+		if (isset($options['v2cachedToken'], $options['v2serviceUrl'])
+			&& $options['v2cachedToken'] instanceof Token
+			&& is_string($options['v2serviceUrl'])) {
 			return [$options['v2cachedToken'], $options['v2serviceUrl']];
 		} else {
 			return parent::authenticate($options);