diff --git a/Cargo.lock b/Cargo.lock
index 29ab0a5..95837c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -36,6 +36,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "async-trait"
+version = "0.1.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.0",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -241,7 +252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
 dependencies = [
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -287,9 +298,12 @@ dependencies = [
 name = "dagger-core"
 version = "0.2.8"
 dependencies = [
+ "async-trait",
+ "base64",
  "dirs",
  "eyre",
  "flate2",
+ "gql_client",
  "graphql-introspection-query",
  "graphql_client",
  "hex",
@@ -310,13 +324,11 @@ dependencies = [
 name = "dagger-sdk"
 version = "0.2.19"
 dependencies = [
- "base64",
  "dagger-core",
  "derive_builder",
  "eyre",
  "futures",
  "genco",
- "gql_client",
  "pretty_assertions",
  "rand",
  "serde",
@@ -348,7 +360,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -359,7 +371,7 @@ checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
 dependencies = [
  "darling_core",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -380,7 +392,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -390,7 +402,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
 dependencies = [
  "derive_builder_core",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -593,7 +605,7 @@ checksum = "3eb14ed937631bd8b8b8977f2c198443447a8355b6e3ca599f38c975e5a963b6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -645,7 +657,7 @@ checksum = "c85fd34848b1f708e6344a4af6f7bfc05172ae20ce4b35c8e417efffb4f306aa"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -732,7 +744,7 @@ dependencies = [
  "quote",
  "serde",
  "serde_json",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -743,7 +755,7 @@ checksum = "d52fc9cde811f44b15ec0692b31e56a3067f6f431c5ace712f286e47c1dacc98"
 dependencies = [
  "graphql_client_codegen",
  "proc-macro2",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1134,7 +1146,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1477,7 +1489,7 @@ checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1574,6 +1586,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cff13bb1732bccfe3b246f3fdb09edfd51c01d6f5299b7ccd9457c2e4e37774"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "tar"
 version = "0.4.38"
@@ -1624,7 +1647,7 @@ checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1680,7 +1703,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1734,7 +1757,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1806,7 +1829,7 @@ checksum = "258bc1c4f8e2e73a977812ab339d503e6feeb92700f6d07a6de4d321522d5c08"
 dependencies = [
  "lazy_static",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1929,7 +1952,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
  "wasm-bindgen-shared",
 ]
 
@@ -1963,7 +1986,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
diff --git a/crates/dagger-codegen/src/rust/functions.rs b/crates/dagger-codegen/src/rust/functions.rs
index 4726b10..7ce020f 100644
--- a/crates/dagger-codegen/src/rust/functions.rs
+++ b/crates/dagger-codegen/src/rust/functions.rs
@@ -247,7 +247,7 @@ fn render_execution(funcs: &CommonFunctions, field: &FullTypeFields) -> rust::To
             return $(output_type) {
                 proc: self.proc.clone(),
                 selection: query,
-                conn: self.conn.clone(),
+                graphql_client: self.graphql_client.clone(),
             }
         };
     }
@@ -273,15 +273,13 @@ fn render_execution(funcs: &CommonFunctions, field: &FullTypeFields) -> rust::To
             return vec![$(output_type) {
                 proc: self.proc.clone(),
                 selection: query,
-                conn: self.conn.clone(),
+                graphql_client: self.graphql_client.clone(),
             }]
         };
     }
 
-    let graphql_client = rust::import("crate::client", "graphql_client");
-
     quote! {
-        query.execute(&$graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 }
 
diff --git a/crates/dagger-codegen/src/rust/templates/object_tmpl.rs b/crates/dagger-codegen/src/rust/templates/object_tmpl.rs
index 96ef908..60b4c01 100644
--- a/crates/dagger-codegen/src/rust/templates/object_tmpl.rs
+++ b/crates/dagger-codegen/src/rust/templates/object_tmpl.rs
@@ -12,15 +12,15 @@ use crate::utility::OptionExt;
 pub fn render_object(funcs: &CommonFunctions, t: &FullType) -> eyre::Result<rust::Tokens> {
     let selection = rust::import("crate::querybuilder", "Selection");
     let child = rust::import("tokio::process", "Child");
-    let conn = rust::import("dagger_core::connect_params", "ConnectParams");
+    let graphql_client = rust::import("dagger_core::graphql_client", "DynGraphQLClient");
     let arc = rust::import("std::sync", "Arc");
 
     Ok(quote! {
-        #[derive(Debug, Clone)]
+        #[derive(Clone)]
         pub struct $(t.name.pipe(|s| format_name(s))) {
             pub proc: $arc<$child>,
             pub selection: $selection,
-            pub conn: $conn,
+            pub graphql_client: $graphql_client
         }
 
         $(t.fields.pipe(|f| render_optional_args(funcs, f)))
diff --git a/crates/dagger-core/Cargo.toml b/crates/dagger-core/Cargo.toml
index dd22c7f..cde1e4a 100644
--- a/crates/dagger-core/Cargo.toml
+++ b/crates/dagger-core/Cargo.toml
@@ -17,6 +17,8 @@ tokio = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 
+base64 = "0.21.0"
+gql_client = "1.0.7"
 dirs = "4.0.0"
 flate2 = { version = "1.0.25", features = ["zlib"] }
 graphql-introspection-query = "0.2.0"
@@ -28,3 +30,4 @@ reqwest = { version = "0.11.14", features = ["stream", "deflate"] }
 sha2 = "0.10.6"
 tar = "0.4.38"
 tempfile = "3.3.0"
+async-trait = "0.1.67"
diff --git a/crates/dagger-core/src/graphql_client.rs b/crates/dagger-core/src/graphql_client.rs
new file mode 100644
index 0000000..77548a2
--- /dev/null
+++ b/crates/dagger-core/src/graphql_client.rs
@@ -0,0 +1,52 @@
+use std::collections::HashMap;
+use std::sync::Arc;
+
+use async_trait::async_trait;
+use base64::engine::general_purpose;
+use base64::Engine;
+use gql_client::ClientConfig;
+
+use crate::connect_params::ConnectParams;
+
+#[async_trait]
+pub trait GraphQLClient {
+    async fn query(&self, query: &str) -> eyre::Result<Option<serde_json::Value>>;
+}
+
+pub type DynGraphQLClient = Arc<dyn GraphQLClient + Send + Sync>;
+
+#[derive(Debug)]
+pub struct DefaultGraphQLClient {
+    client: gql_client::Client,
+}
+
+impl DefaultGraphQLClient {
+    pub fn new(conn: &ConnectParams) -> Self {
+        let token = general_purpose::URL_SAFE.encode(format!("{}:", conn.session_token));
+
+        let mut headers = HashMap::new();
+        headers.insert("Authorization".to_string(), format!("Basic {}", token));
+
+        Self {
+            client: gql_client::Client::new_with_config(ClientConfig {
+                endpoint: conn.url(),
+                timeout: Some(1000),
+                headers: Some(headers),
+                proxy: None,
+            }),
+        }
+    }
+}
+
+#[async_trait]
+impl GraphQLClient for DefaultGraphQLClient {
+    async fn query(&self, query: &str) -> eyre::Result<Option<serde_json::Value>> {
+        let res: Option<serde_json::Value> = self
+            .client
+            .query(&query)
+            .await
+            .map_err(|r| eyre::anyhow!(r.to_string()))?;
+
+        return Ok(res);
+    }
+}
diff --git a/crates/dagger-core/src/lib.rs b/crates/dagger-core/src/lib.rs
index dc6ffee..9363c24 100644
--- a/crates/dagger-core/src/lib.rs
+++ b/crates/dagger-core/src/lib.rs
@@ -7,6 +7,7 @@ pub mod config;
 pub mod connect_params;
 pub mod downloader;
 pub mod engine;
+pub mod graphql_client;
 pub mod introspection;
 pub mod logger;
 pub mod schema;
diff --git a/crates/dagger-sdk/Cargo.toml b/crates/dagger-sdk/Cargo.toml
index 2954751..67eb00e 100644
--- a/crates/dagger-sdk/Cargo.toml
+++ b/crates/dagger-sdk/Cargo.toml
@@ -20,9 +20,7 @@ serde_json = { workspace = true }
 tracing.workspace = true
 tracing-subscriber.workspace = true
 
-base64 = "0.21.0"
 futures = "0.3.27"
-gql_client = "1.0.7"
 derive_builder = "0.12.0"
 
 [dev-dependencies]
diff --git a/crates/dagger-sdk/src/client.rs b/crates/dagger-sdk/src/client.rs
index f58dacd..913f8f1 100644
--- a/crates/dagger-sdk/src/client.rs
+++ b/crates/dagger-sdk/src/client.rs
@@ -1,12 +1,8 @@
-use std::collections::HashMap;
 use std::sync::Arc;
 
-use base64::engine::general_purpose;
-use base64::Engine;
-use gql_client::ClientConfig;
+use dagger_core::graphql_client::DefaultGraphQLClient;
 
 use dagger_core::config::Config;
-use dagger_core::connect_params::ConnectParams;
 use dagger_core::engine::Engine as DaggerEngine;
 
 use crate::gen::Query;
@@ -25,26 +21,12 @@ pub async fn connect_opts(cfg: Config) -> eyre::Result<DaggerConn> {
     let (conn, proc) = DaggerEngine::new().start(&cfg).await?;
 
     Ok(Arc::new(Query {
-        conn,
         proc: Arc::new(proc),
         selection: query(),
+        graphql_client: Arc::new(DefaultGraphQLClient::new(&conn)),
     }))
 }
 
-pub fn graphql_client(conn: &ConnectParams) -> gql_client::Client {
-    let token = general_purpose::URL_SAFE.encode(format!("{}:", conn.session_token));
-
-    let mut headers = HashMap::new();
-    headers.insert("Authorization".to_string(), format!("Basic {}", token));
-
-    gql_client::Client::new_with_config(ClientConfig {
-        endpoint: conn.url(),
-        timeout: Some(1000),
-        headers: Some(headers),
-        proxy: None,
-    })
-}
-
 // Conn will automatically close on drop of proc
 
 #[cfg(test)]
diff --git a/crates/dagger-sdk/src/gen.rs b/crates/dagger-sdk/src/gen.rs
index 4122415..22c9ff4 100644
--- a/crates/dagger-sdk/src/gen.rs
+++ b/crates/dagger-sdk/src/gen.rs
@@ -1,6 +1,5 @@
-use crate::client::graphql_client;
 use crate::querybuilder::Selection;
-use dagger_core::connect_params::ConnectParams;
+use dagger_core::graphql_client::DynGraphQLClient;
 use derive_builder::Builder;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
@@ -114,25 +113,25 @@ pub struct PipelineLabel {
     pub name: String,
     pub value: String,
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct CacheVolume {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 impl CacheVolume {
     pub async fn id(&self) -> eyre::Result<CacheId> {
         let query = self.selection.select("id");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Container {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 #[derive(Builder, Debug, PartialEq)]
@@ -295,7 +294,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -322,14 +321,14 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves default arguments for future commands.
     pub async fn default_args(&self) -> eyre::Result<Vec<String>> {
         let query = self.selection.select("defaultArgs");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Retrieves a directory at the given path.
     /// Mounts are included.
@@ -345,7 +344,7 @@ impl Container {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves an endpoint that clients can use to reach this container.
@@ -359,7 +358,7 @@ impl Container {
     pub async fn endpoint(&self) -> eyre::Result<String> {
         let query = self.selection.select("endpoint");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 
     /// Retrieves an endpoint that clients can use to reach this container.
@@ -380,13 +379,13 @@ impl Container {
             query = query.arg("scheme", scheme);
         }
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Retrieves entrypoint to be prepended to the arguments of all commands.
     pub async fn entrypoint(&self) -> eyre::Result<Vec<String>> {
         let query = self.selection.select("entrypoint");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Retrieves the value of the specified environment variable.
     ///
@@ -398,7 +397,7 @@ impl Container {
 
         query = query.arg("name", name.into());
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Retrieves the list of environment variables passed to commands.
     pub fn env_variables(&self) -> Vec<EnvVariable> {
@@ -407,7 +406,7 @@ impl Container {
         return vec![EnvVariable {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         }];
     }
     /// Retrieves this container after executing the specified command inside it.
@@ -421,7 +420,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -455,7 +454,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Exit code of the last executed command. Zero means success.
@@ -463,7 +462,7 @@ impl Container {
     pub async fn exit_code(&self) -> eyre::Result<isize> {
         let query = self.selection.select("exitCode");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Writes the container as an OCI tarball to the destination file path on the host for the specified platform variants.
     /// Return true on success.
@@ -479,7 +478,7 @@ impl Container {
 
         query = query.arg("path", path.into());
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 
     /// Writes the container as an OCI tarball to the destination file path on the host for the specified platform variants.
@@ -503,7 +502,7 @@ impl Container {
             query = query.arg("platformVariants", platform_variants);
         }
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Retrieves the list of exposed ports.
     /// Currently experimental; set _EXPERIMENTAL_DAGGER_SERVICES_DNS=0 to disable.
@@ -513,7 +512,7 @@ impl Container {
         return vec![Port {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         }];
     }
     /// Retrieves a file at the given path.
@@ -530,7 +529,7 @@ impl Container {
         return File {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Initializes this container from a pulled base image.
@@ -548,7 +547,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container's root filesystem. Mounts are not included.
@@ -558,7 +557,7 @@ impl Container {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves a hostname which can be used by clients to reach this container.
@@ -566,19 +565,19 @@ impl Container {
     pub async fn hostname(&self) -> eyre::Result<String> {
         let query = self.selection.select("hostname");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// A unique identifier for this container.
     pub async fn id(&self) -> eyre::Result<ContainerId> {
         let query = self.selection.select("id");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// The unique image reference which can only be retrieved immediately after the 'Container.From' call.
     pub async fn image_ref(&self) -> eyre::Result<String> {
         let query = self.selection.select("imageRef");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Retrieves the value of the specified label.
     pub async fn label(&self, name: impl Into<String>) -> eyre::Result<String> {
@@ -586,7 +585,7 @@ impl Container {
 
         query = query.arg("name", name.into());
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Retrieves the list of labels passed to container.
     pub fn labels(&self) -> Vec<Label> {
@@ -595,14 +594,14 @@ impl Container {
         return vec![Label {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         }];
     }
     /// Retrieves the list of paths where a directory is mounted.
     pub async fn mounts(&self) -> eyre::Result<Vec<String>> {
         let query = self.selection.select("mounts");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Creates a named sub-pipeline
     ///
@@ -618,7 +617,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -646,14 +645,14 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// The platform this container executes and publishes as.
     pub async fn platform(&self) -> eyre::Result<Platform> {
         let query = self.selection.select("platform");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Publishes this container as a new image to the specified address.
     /// Publish returns a fully qualified ref.
@@ -670,7 +669,7 @@ impl Container {
 
         query = query.arg("address", address.into());
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 
     /// Publishes this container as a new image to the specified address.
@@ -695,7 +694,7 @@ impl Container {
             query = query.arg("platformVariants", platform_variants);
         }
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Retrieves this container's root filesystem. Mounts are not included.
     pub fn rootfs(&self) -> Directory {
@@ -704,7 +703,7 @@ impl Container {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// The error stream of the last executed command.
@@ -712,20 +711,20 @@ impl Container {
     pub async fn stderr(&self) -> eyre::Result<String> {
         let query = self.selection.select("stderr");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// The output stream of the last executed command.
     /// Errors if no command has been executed.
     pub async fn stdout(&self) -> eyre::Result<String> {
         let query = self.selection.select("stdout");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Retrieves the user to be set for all commands.
     pub async fn user(&self) -> eyre::Result<String> {
         let query = self.selection.select("user");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Configures default arguments for future commands.
     ///
@@ -738,7 +737,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -757,7 +756,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container plus a directory written at the given path.
@@ -776,7 +775,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -807,7 +806,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container but with a different command entrypoint.
@@ -826,7 +825,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container plus the given environment variable.
@@ -848,7 +847,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container after executing the specified command inside it.
@@ -868,7 +867,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -911,7 +910,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Expose a network port.
@@ -932,7 +931,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -964,7 +963,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Initializes this container from this DirectoryID.
@@ -976,7 +975,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container plus the contents of the given file copied to the given path.
@@ -995,7 +994,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -1023,7 +1022,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container plus the given label.
@@ -1041,7 +1040,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container plus a cache volume mounted at the given path.
@@ -1060,7 +1059,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -1091,7 +1090,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container plus a directory mounted at the given path.
@@ -1113,7 +1112,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container plus a file mounted at the given path.
@@ -1131,7 +1130,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container plus a secret mounted into a file at the given path.
@@ -1149,7 +1148,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container plus a temporary directory mounted at the given path.
@@ -1165,7 +1164,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container plus a new file written at the given path.
@@ -1182,7 +1181,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -1210,7 +1209,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container with a registry authentication for a given address.
@@ -1236,7 +1235,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Initializes this container from this DirectoryID.
@@ -1248,7 +1247,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container plus an env variable containing the given secret.
@@ -1266,7 +1265,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Establish a runtime dependency on a service. The service will be started automatically when needed and detached when it is no longer needed.
@@ -1291,7 +1290,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container plus a socket forwarded to the given Unix socket path.
@@ -1309,7 +1308,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container with a different command user.
@@ -1325,7 +1324,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container with a different working directory.
@@ -1341,7 +1340,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container minus the given environment variable.
@@ -1357,7 +1356,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Unexpose a previously exposed port.
@@ -1375,7 +1374,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -1401,7 +1400,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container minus the given environment label.
@@ -1417,7 +1416,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container after unmounting everything at the given path.
@@ -1433,7 +1432,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container without the registry authentication of a given address.
@@ -1450,7 +1449,7 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this container with a previously added Unix socket removed.
@@ -1466,21 +1465,21 @@ impl Container {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves the working directory for all commands.
     pub async fn workdir(&self) -> eyre::Result<String> {
         let query = self.selection.select("workdir");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Directory {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 #[derive(Builder, Debug, PartialEq)]
@@ -1559,7 +1558,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves a directory at the given path.
@@ -1575,7 +1574,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Builds a new Docker container from this directory.
@@ -1589,7 +1588,7 @@ impl Directory {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -1617,7 +1616,7 @@ impl Directory {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Returns a list of files and directories at the given path.
@@ -1628,7 +1627,7 @@ impl Directory {
     pub async fn entries(&self) -> eyre::Result<Vec<String>> {
         let query = self.selection.select("entries");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 
     /// Returns a list of files and directories at the given path.
@@ -1646,7 +1645,7 @@ impl Directory {
             query = query.arg("path", path);
         }
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Writes the contents of the directory to a path on the host.
     ///
@@ -1658,7 +1657,7 @@ impl Directory {
 
         query = query.arg("path", path.into());
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Retrieves a file at the given path.
     ///
@@ -1673,14 +1672,14 @@ impl Directory {
         return File {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// The content-addressed identifier of the directory.
     pub async fn id(&self) -> eyre::Result<DirectoryId> {
         let query = self.selection.select("id");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// load a project's metadata
     pub fn load_project(&self, config_path: impl Into<String>) -> Project {
@@ -1691,7 +1690,7 @@ impl Directory {
         return Project {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Creates a named sub-pipeline
@@ -1708,7 +1707,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -1736,7 +1735,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this directory plus a directory written at the given path.
@@ -1755,7 +1754,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -1786,7 +1785,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this directory plus the contents of the given file copied to the given path.
@@ -1805,7 +1804,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -1833,7 +1832,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this directory plus a new directory created at the given path.
@@ -1850,7 +1849,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -1875,7 +1874,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this directory plus a new file written at the given path.
@@ -1894,7 +1893,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -1922,7 +1921,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this directory with all file/dir timestamps set to the given time.
@@ -1940,7 +1939,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this directory with the directory at the given path removed.
@@ -1956,7 +1955,7 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves this directory with the file at the given path removed.
@@ -1972,15 +1971,15 @@ impl Directory {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct EnvVariable {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 impl EnvVariable {
@@ -1988,20 +1987,20 @@ impl EnvVariable {
     pub async fn name(&self) -> eyre::Result<String> {
         let query = self.selection.select("name");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// The environment variable value.
     pub async fn value(&self) -> eyre::Result<String> {
         let query = self.selection.select("value");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct File {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 impl File {
@@ -2009,7 +2008,7 @@ impl File {
     pub async fn contents(&self) -> eyre::Result<String> {
         let query = self.selection.select("contents");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Writes the file to a file path on the host.
     ///
@@ -2021,13 +2020,13 @@ impl File {
 
         query = query.arg("path", path.into());
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Retrieves the content-addressed identifier of the file.
     pub async fn id(&self) -> eyre::Result<FileId> {
         let query = self.selection.select("id");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Retrieves a secret referencing the contents of this file.
     pub fn secret(&self) -> Secret {
@@ -2036,14 +2035,14 @@ impl File {
         return Secret {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Gets the size of the file, in bytes.
     pub async fn size(&self) -> eyre::Result<isize> {
         let query = self.selection.select("size");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Retrieves this file with its created/modified timestamps set to the given time.
     ///
@@ -2060,15 +2059,15 @@ impl File {
         return File {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct GitRef {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 #[derive(Builder, Debug, PartialEq)]
@@ -2084,7 +2083,7 @@ impl GitRef {
     pub async fn digest(&self) -> eyre::Result<String> {
         let query = self.selection.select("digest");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// The filesystem tree at this ref.
     ///
@@ -2097,7 +2096,7 @@ impl GitRef {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -2119,15 +2118,15 @@ impl GitRef {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct GitRepository {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 impl GitRepository {
@@ -2144,14 +2143,14 @@ impl GitRepository {
         return GitRef {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Lists of branches on the repository.
     pub async fn branches(&self) -> eyre::Result<Vec<String>> {
         let query = self.selection.select("branches");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Returns details on one commit.
     ///
@@ -2166,7 +2165,7 @@ impl GitRepository {
         return GitRef {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Returns details on one tag.
@@ -2182,21 +2181,21 @@ impl GitRepository {
         return GitRef {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Lists of tags on the repository.
     pub async fn tags(&self) -> eyre::Result<Vec<String>> {
         let query = self.selection.select("tags");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Host {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 #[derive(Builder, Debug, PartialEq)]
@@ -2233,7 +2232,7 @@ impl Host {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -2261,7 +2260,7 @@ impl Host {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Accesses an environment variable on the host.
@@ -2277,7 +2276,7 @@ impl Host {
         return HostVariable {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Accesses a Unix socket on the host.
@@ -2293,7 +2292,7 @@ impl Host {
         return Socket {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Retrieves the current working directory on the host.
@@ -2307,7 +2306,7 @@ impl Host {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -2329,15 +2328,15 @@ impl Host {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct HostVariable {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 impl HostVariable {
@@ -2348,21 +2347,21 @@ impl HostVariable {
         return Secret {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// The value of this variable.
     pub async fn value(&self) -> eyre::Result<String> {
         let query = self.selection.select("value");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Label {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 impl Label {
@@ -2370,20 +2369,20 @@ impl Label {
     pub async fn name(&self) -> eyre::Result<String> {
         let query = self.selection.select("name");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// The label value.
     pub async fn value(&self) -> eyre::Result<String> {
         let query = self.selection.select("value");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Port {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 impl Port {
@@ -2391,26 +2390,26 @@ impl Port {
     pub async fn description(&self) -> eyre::Result<String> {
         let query = self.selection.select("description");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// The port number.
     pub async fn port(&self) -> eyre::Result<isize> {
         let query = self.selection.select("port");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// The transport layer network protocol.
     pub async fn protocol(&self) -> eyre::Result<NetworkProtocol> {
         let query = self.selection.select("protocol");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Project {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 impl Project {
@@ -2421,7 +2420,7 @@ impl Project {
         return vec![Project {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         }];
     }
     /// Code files generated by the SDKs in the project
@@ -2431,39 +2430,39 @@ impl Project {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// install the project's schema
     pub async fn install(&self) -> eyre::Result<bool> {
         let query = self.selection.select("install");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// name of the project
     pub async fn name(&self) -> eyre::Result<String> {
         let query = self.selection.select("name");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// schema provided by the project
     pub async fn schema(&self) -> eyre::Result<String> {
         let query = self.selection.select("schema");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// sdk used to generate code for and/or execute this project
     pub async fn sdk(&self) -> eyre::Result<String> {
         let query = self.selection.select("sdk");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Query {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 #[derive(Builder, Debug, PartialEq)]
@@ -2522,7 +2521,7 @@ impl Query {
         return CacheVolume {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Loads a container from ID.
@@ -2539,7 +2538,7 @@ impl Query {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -2564,14 +2563,14 @@ impl Query {
         return Container {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// The default platform of the builder.
     pub async fn default_platform(&self) -> eyre::Result<Platform> {
         let query = self.selection.select("defaultPlatform");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// Load a directory by ID. No argument produces an empty directory.
     ///
@@ -2584,7 +2583,7 @@ impl Query {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -2603,7 +2602,7 @@ impl Query {
         return Directory {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Loads a file by ID.
@@ -2615,7 +2614,7 @@ impl Query {
         return File {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Queries a git repository.
@@ -2634,7 +2633,7 @@ impl Query {
         return GitRepository {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -2660,7 +2659,7 @@ impl Query {
         return GitRepository {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Queries the host environment.
@@ -2670,7 +2669,7 @@ impl Query {
         return Host {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Returns a file containing an http remote url content.
@@ -2687,7 +2686,7 @@ impl Query {
         return File {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -2708,7 +2707,7 @@ impl Query {
         return File {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Creates a named sub-pipeline.
@@ -2725,7 +2724,7 @@ impl Query {
         return Query {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -2749,7 +2748,7 @@ impl Query {
         return Query {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Look up a project by name
@@ -2761,7 +2760,7 @@ impl Query {
         return Project {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Loads a secret from its ID.
@@ -2773,7 +2772,7 @@ impl Query {
         return Secret {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
     /// Loads a socket by its ID.
@@ -2787,7 +2786,7 @@ impl Query {
         return Socket {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 
@@ -2806,15 +2805,15 @@ impl Query {
         return Socket {
             proc: self.proc.clone(),
             selection: query,
-            conn: self.conn.clone(),
+            graphql_client: self.graphql_client.clone(),
         };
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Secret {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 impl Secret {
@@ -2822,20 +2821,20 @@ impl Secret {
     pub async fn id(&self) -> eyre::Result<SecretId> {
         let query = self.selection.select("id");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
     /// The value of this secret.
     pub async fn plaintext(&self) -> eyre::Result<String> {
         let query = self.selection.select("plaintext");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 }
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct Socket {
     pub proc: Arc<Child>,
     pub selection: Selection,
-    pub conn: ConnectParams,
+    pub graphql_client: DynGraphQLClient,
 }
 
 impl Socket {
@@ -2843,7 +2842,7 @@ impl Socket {
     pub async fn id(&self) -> eyre::Result<SocketId> {
         let query = self.selection.select("id");
 
-        query.execute(&graphql_client(&self.conn)).await
+        query.execute(self.graphql_client.clone()).await
     }
 }
 #[derive(Serialize, Deserialize, Clone, PartialEq, Debug)]
diff --git a/crates/dagger-sdk/src/querybuilder.rs b/crates/dagger-sdk/src/querybuilder.rs
index 7516b94..4fd586c 100644
--- a/crates/dagger-sdk/src/querybuilder.rs
+++ b/crates/dagger-sdk/src/querybuilder.rs
@@ -1,5 +1,6 @@
 use std::{collections::HashMap, ops::Add, sync::Arc};
 
+use dagger_core::graphql_client::DynGraphQLClient;
 use eyre::Context;
 use serde::{Deserialize, Serialize};
 
@@ -116,7 +117,7 @@ impl Selection {
         Ok(fields.join("{") + &"}".repeat(fields.len() - 1))
     }
 
-    pub async fn execute<D>(&self, gql_client: &gql_client::Client) -> eyre::Result<D>
+    pub async fn execute<D>(&self, gql_client: DynGraphQLClient) -> eyre::Result<D>
     where
         D: for<'de> Deserialize<'de>,
     {