only use cache if username matches

src/config.rs

@@ -633,16 +633,11 @@ pub(crate) fn get_internal_config(config: CliConfig) -> SpotifydConfig {
     let cache = config
         .shared_config
         .cache_path
-        .map(PathBuf::from)
-        // TODO: plumb size limits, check audio_cache?
-        // TODO: rather than silently disabling cache if constructor fails, maybe we should handle the error?
-        .and_then(|path| {
-            Cache::new(
-                Some(path.clone()),
-                if audio_cache { Some(path) } else { None },
-                size_limit,
-            )
-            .ok()
+        .map(|path| Cache::new(Some(&path), audio_cache.then_some(&path), size_limit))
+        .transpose()
+        .unwrap_or_else(|e| {
+            warn!("Cache couldn't be initialized: {e}");
+            None
         });
 
     let bitrate: LSBitrate = config

src/setup.rs

@@ -148,11 +148,16 @@ fn get_credentials(
     username: &Option<String>,
     password: &Option<String>,
 ) -> Option<Credentials> {
-    if let (Some(username), Some(password)) = (username, password) {
-        return Some(Credentials::with_password(username, password));
+    if let Some(credentials) = cache.as_ref().and_then(Cache::credentials) {
+        if username.as_ref() == Some(&credentials.username) {
+            return Some(credentials);
+        }
     }
 
-    cache.as_ref()?.credentials()
+    Some(Credentials::with_password(
+        username.as_ref()?,
+        password.as_ref()?,
+    ))
 }
 
 fn find_backend(name: Option<&str>) -> fn(Option<String>, AudioFormat) -> Box<dyn Sink> {