diff --git a/osbuild/sources.py b/osbuild/sources.py
index 90ca1de9..384180af 100644
--- a/osbuild/sources.py
+++ b/osbuild/sources.py
@@ -20,7 +20,7 @@ class Source:
 
     def download(self, store: ObjectStore, libdir: PathLike):
         source = self.info.name
-        cache = os.path.join(store.store, "sources", source)
+        cache = os.path.join(store.store, "sources")
         msg = {
             "items": self.items,
             "options": self.options,
@@ -73,7 +73,7 @@ class SourcesServer(api.BaseAPI):
         msg = {
             "items": {},
             "options": self.options.get(source, {}),
-            "cache": f"{self.cache}/{source}",
+            "cache": self.cache,
             "output": f"{self.output}/{source}",
             "checksums": checksums,
             "libdir": self.libdir
diff --git a/sources/org.osbuild.files b/sources/org.osbuild.files
index 316f3469..842d080c 100755
--- a/sources/org.osbuild.files
+++ b/sources/org.osbuild.files
@@ -235,6 +235,7 @@ def export(checksums, cache, output):
 
 
 def main(urls, options, checksums, cache, output):
+    cache = os.path.join(cache, "org.osbuild.files")
     download_only = not output
 
     if not urls:
diff --git a/sources/org.osbuild.ostree b/sources/org.osbuild.ostree
index a73a069c..caf0e489 100755
--- a/sources/org.osbuild.ostree
+++ b/sources/org.osbuild.ostree
@@ -127,6 +127,7 @@ def export(checksums, cache, output):
 
 
 def main(commits, options, checksums, cache, output):
+    cache = os.path.join(cache, "org.osbuild.ostree")
 
     if not commits:
         commits = options.get("commits", {})