diff --git a/app/src/main/java/com/etesync/syncadapter/EtebaseLocalCache.kt b/app/src/main/java/com/etesync/syncadapter/EtebaseLocalCache.kt
index b51c2756..5bab8e9c 100644
--- a/app/src/main/java/com/etesync/syncadapter/EtebaseLocalCache.kt
+++ b/app/src/main/java/com/etesync/syncadapter/EtebaseLocalCache.kt
@@ -38,7 +38,7 @@ class EtebaseLocalCache private constructor(context: Context, username: String)
         return File(colDir, "items")
     }
 
-    fun clearUserCache() {
+    private fun clearUserCache() {
         filesDir.deleteRecursively()
     }
 
@@ -153,6 +153,12 @@ class EtebaseLocalCache private constructor(context: Context, username: String)
             }
         }
 
+        fun clearUserCache(context: Context, username: String) {
+            val localCache = getInstance(context, username)
+            localCache.clearUserCache()
+            localCacheCache.remove(username)
+        }
+
         // FIXME: If we ever cache this we need to cache bust on changePassword
         fun getEtebase(context: Context, httpClient: OkHttpClient, settings: AccountSettings): Account {
             val client = Client.create(httpClient, settings.uri?.toString())
diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
index 84e7938e..dbea30be 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
@@ -562,8 +562,7 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
                     Logger.log.warning(e.toString())
                 }
             } else {
-                val etebaseLocalCache = EtebaseLocalCache.getInstance(this@AccountActivity, account.name)
-                etebaseLocalCache.clearUserCache()
+                EtebaseLocalCache.clearUserCache(this@AccountActivity, account.name)
 
                 try {
                     val httpClient = HttpClient.Builder(this@AccountActivity).build()