diff --git a/magic-nix-cache/src/gha.rs b/magic-nix-cache/src/gha.rs
index 086c97d..a7017ca 100644
--- a/magic-nix-cache/src/gha.rs
+++ b/magic-nix-cache/src/gha.rs
@@ -59,7 +59,7 @@ impl GhaCache {
 
         let worker_result = tokio::task::spawn(async move {
             worker(
-                &api2,
+                api2,
                 store,
                 channel_rx,
                 metrics,
@@ -115,7 +115,7 @@ impl GhaCache {
 }
 
 async fn worker(
-    api: &Api,
+    api: Arc<Api>,
     store: Arc<NixStore>,
     mut channel_rx: UnboundedReceiver<Request>,
     metrics: Arc<telemetry::TelemetryReport>,
@@ -123,6 +123,7 @@ async fn worker(
 ) -> Result<()> {
     let mut done = HashSet::new();
 
+    let mut handles = tokio::task::JoinSet::new();
     while let Some(req) = channel_rx.recv().await {
         match req {
             Request::Shutdown => {
@@ -138,31 +139,39 @@ async fn worker(
                     continue;
                 }
 
-                if let Err(err) = upload_path(
-                    api,
-                    store.clone(),
-                    &path,
-                    metrics.clone(),
-                    narinfo_negative_cache.clone(),
-                )
-                .await
-                {
-                    tracing::error!(
-                        "Upload of path '{}' failed: {}",
-                        store.get_full_path(&path).display(),
-                        err
-                    );
-                }
+                let path = path.clone();
+                let store = Arc::clone(&store);
+                let api = Arc::clone(&api);
+                let metrics = Arc::clone(&metrics);
+                let narinfo_negative_cache = Arc::clone(&narinfo_negative_cache);
+
+                handles.spawn(async move {
+                    if let Err(err) =
+                        upload_path(&api, &store, &path, metrics, narinfo_negative_cache).await
+                    {
+                        tracing::error!(
+                            "Upload of path '{}' failed: {}",
+                            store.get_full_path(&path).display(),
+                            err
+                        );
+                    }
+                });
             }
         }
     }
 
+    while let Some(ret) = handles.join_next().await {
+        if let Err(e) = ret {
+            tracing::error!("Upload task failed: {}", e);
+        }
+    }
+
     Ok(())
 }
 
 async fn upload_path(
     api: &Api,
-    store: Arc<NixStore>,
+    store: &Arc<NixStore>,
     path: &StorePath,
     metrics: Arc<telemetry::TelemetryReport>,
     narinfo_negative_cache: Arc<RwLock<HashSet<String>>>,
@@ -197,7 +206,7 @@ async fn upload_path(
 
     let narinfo_allocation = api.allocate_file_with_random_suffix(&narinfo_path).await?;
 
-    let narinfo = path_info_to_nar_info(store.clone(), &path_info, format!("nar/{}", nar_path))
+    let narinfo = path_info_to_nar_info(Arc::clone(store), &path_info, format!("nar/{}", nar_path))
         .to_string()
         .expect("failed to convert path into to nar info");