diff --git a/radicale/storage/multifilesystem/base.py b/radicale/storage/multifilesystem/base.py
index 7b1b7d286..f6e56b3ac 100644
--- a/radicale/storage/multifilesystem/base.py
+++ b/radicale/storage/multifilesystem/base.py
@@ -44,7 +44,7 @@ def __init__(self, storage_: "multifilesystem.Storage", path: str,
             filesystem_path = pathutils.path_to_filesystem(folder, self.path)
         self._filesystem_path = filesystem_path
 
-    @types.contextmanager
+    @types.contextmanager # type: ignore # for now, TODO fix for "mypy"
     def _atomic_write(self, path: str, mode: str = "w",
                       newline: Optional[str] = None) -> Iterator[IO[AnyStr]]:
         # TODO: Overload with Literal when dropping support for Python < 3.8
diff --git a/radicale/storage/multifilesystem/cache.py b/radicale/storage/multifilesystem/cache.py
index 9cb4dda6d..086f2ac3e 100644
--- a/radicale/storage/multifilesystem/cache.py
+++ b/radicale/storage/multifilesystem/cache.py
@@ -86,7 +86,7 @@ def _store_item_cache(self, href: str, item: radicale_item.Item,
         content = self._item_cache_content(item)
         self._storage._makedirs_synced(cache_folder)
         # Race: Other processes might have created and locked the file.
-        with contextlib.suppress(PermissionError), self._atomic_write(
+        with contextlib.suppress(PermissionError), self._atomic_write( # type: ignore # for now, TODO fix for "mypy"
                 os.path.join(cache_folder, href), "wb") as fo:
             fb = cast(BinaryIO, fo)
             pickle.dump((cache_hash, *content), fb)
diff --git a/radicale/storage/multifilesystem/meta.py b/radicale/storage/multifilesystem/meta.py
index edce65136..47c8323e8 100644
--- a/radicale/storage/multifilesystem/meta.py
+++ b/radicale/storage/multifilesystem/meta.py
@@ -61,6 +61,6 @@ def get_meta(self, key: Optional[str] = None) -> Union[Mapping[str, str],
         return self._meta_cache if key is None else self._meta_cache.get(key)
 
     def set_meta(self, props: Mapping[str, str]) -> None:
-        with self._atomic_write(self._props_path, "w") as fo:
+        with self._atomic_write(self._props_path, "w") as fo: # type: ignore # for now, TODO fix for "mypy"
             f = cast(TextIO, fo)
             json.dump(props, f, sort_keys=True)
diff --git a/radicale/storage/multifilesystem/sync.py b/radicale/storage/multifilesystem/sync.py
index 83cbe2a00..75eae84a4 100644
--- a/radicale/storage/multifilesystem/sync.py
+++ b/radicale/storage/multifilesystem/sync.py
@@ -95,7 +95,7 @@ def check_token_name(token_name: str) -> bool:
             self._storage._makedirs_synced(token_folder)
             try:
                 # Race: Other processes might have created and locked the file.
-                with self._atomic_write(token_path, "wb") as fo:
+                with self._atomic_write(token_path, "wb") as fo: # type: ignore # for now, TODO fix for "mypy"
                     fb = cast(BinaryIO, fo)
                     pickle.dump(state, fb)
             except PermissionError:
diff --git a/radicale/storage/multifilesystem/upload.py b/radicale/storage/multifilesystem/upload.py
index 730e4cb21..a91f83b7e 100644
--- a/radicale/storage/multifilesystem/upload.py
+++ b/radicale/storage/multifilesystem/upload.py
@@ -43,7 +43,7 @@ def upload(self, href: str, item: radicale_item.Item
             raise ValueError("Failed to store item %r in collection %r: %s" %
                              (href, self.path, e)) from e
         path = pathutils.path_to_filesystem(self._filesystem_path, href)
-        with self._atomic_write(path, newline="") as fo:
+        with self._atomic_write(path, newline="") as fo: # type: ignore # for now, TODO fix for "mypy"
             f = cast(TextIO, fo)
             f.write(item.serialize())
         # Clean the cache after the actual item is stored, or the cache entry