diff --git a/proxy/src/crypto.rs b/proxy/src/crypto.rs
index 3e8c7849..1dc313b6 100644
--- a/proxy/src/crypto.rs
+++ b/proxy/src/crypto.rs
@@ -16,6 +16,10 @@ pub(crate) struct GetCertsFromBroker {
 }
 
 impl GetCertsFromBroker {
+    pub fn new(client: SamplyHttpClient, config: Config) -> Self {
+        Self { client, config }
+    }
+
     async fn request(&self, path: &str) -> Result<reqwest::Response, SamplyBeamError> {
         let uri = Uri::builder()
             .scheme(self.config.broker_uri.scheme())
@@ -95,17 +99,6 @@ impl GetCerts for GetCertsFromBroker {
     }
 }
 
-pub(crate) fn build_cert_getter(
-    config: Config,
-    client: SamplyHttpClient,
-) -> Result<GetCertsFromBroker, SamplyBeamError> {
-    let client = client;
-    Ok(GetCertsFromBroker {
-        client,
-        config,
-    })
-}
-
 pub async fn init_public_crypto_for_proxy(
     config: &Config
 ) -> Result<(ProxyCertInfo, config::ConfigCrypto), SamplyBeamError> {
diff --git a/proxy/src/main.rs b/proxy/src/main.rs
index 297e6230..fe18fba1 100644
--- a/proxy/src/main.rs
+++ b/proxy/src/main.rs
@@ -17,6 +17,7 @@ use tracing::{debug, error, info, warn};
 use tryhard::{backoff_strategies::ExponentialBackoff, RetryFuture, RetryFutureConfig};
 
 use crate::config::{CliArgs, Config};
+use crate::crypto::GetCertsFromBroker;
 use crate::serve_tasks::sign_request;
 
 mod auth;
@@ -69,7 +70,11 @@ pub async fn main() -> anyhow::Result<()> {
         info!("Connected to Broker: {}", &config.broker_uri);
     }
 
-    let result = retry_notify(|| init_crypto(&config, &client), |err, dur| {
+    shared::crypto::init_cert_getter(GetCertsFromBroker::new(
+        client.clone(),
+        config.clone(),
+    ));
+    let result = retry_notify(|| init_crypto(&config), |err, dur| {
         warn!("Still trying to initialize certificate chain: {err}. Retrying in {}s", dur.as_secs());
     }).await;
     let config = match result {
@@ -105,11 +110,7 @@ where
         .on_retry(Box::new(move |_, b, e| futures::future::ready(on_error(e, b.unwrap_or(Duration::MAX)))))
 }
 
-async fn init_crypto(config: &Config, client: &SamplyHttpClient) -> Result<config::ConfigCrypto, SamplyBeamError> {
-    shared::crypto::init_cert_getter(crypto::build_cert_getter(
-        config.clone(),
-        client.clone(),
-    )?);
+async fn init_crypto(config: &Config) -> Result<config::ConfigCrypto, SamplyBeamError> {
     shared::crypto::init_ca_chain(&config.rootcert).await?;
 
     let _public_info: Vec<_> =