diff --git a/Cargo.lock b/Cargo.lock
index 1ed407e83..dae11dd35 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2948,6 +2948,12 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "io_tee"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b3f7cef34251886990511df1c61443aa928499d598a9473929ab5a90a527304"
+
 [[package]]
 name = "ipnet"
 version = "2.9.0"
@@ -4667,6 +4673,7 @@ dependencies = [
  "http 0.2.12",
  "hyper 0.14.28",
  "hyper-tls",
+ "io_tee",
  "itertools 0.10.5",
  "jsonrpsee-core",
  "jsonrpsee-http-client",
diff --git a/cmd/soroban-cli/Cargo.toml b/cmd/soroban-cli/Cargo.toml
index 7874cb2f5..27689c3f5 100644
--- a/cmd/soroban-cli/Cargo.toml
+++ b/cmd/soroban-cli/Cargo.toml
@@ -118,6 +118,7 @@ futures = "0.3.30"
 home = "0.5.9"
 flate2 = "1.0.30"
 bytesize = "1.3.0"
+io_tee = "0.1.1"
 
 # For hyper-tls
 [target.'cfg(unix)'.dependencies]
diff --git a/cmd/soroban-cli/src/commands/config/data.rs b/cmd/soroban-cli/src/commands/config/data.rs
index 409ef2227..23dedc619 100644
--- a/cmd/soroban-cli/src/commands/config/data.rs
+++ b/cmd/soroban-cli/src/commands/config/data.rs
@@ -50,6 +50,12 @@ pub fn spec_dir() -> Result<std::path::PathBuf, Error> {
     Ok(dir)
 }
 
+pub fn bucket_dir() -> Result<std::path::PathBuf, Error> {
+    let dir = data_local_dir()?.join("bucket");
+    std::fs::create_dir_all(&dir)?;
+    Ok(dir)
+}
+
 pub fn write(action: Action, rpc_url: &Uri) -> Result<ulid::Ulid, Error> {
     let data = Data {
         action,
diff --git a/cmd/soroban-cli/src/commands/snapshot.rs b/cmd/soroban-cli/src/commands/snapshot.rs
index 4019e871f..a17c5a4dd 100644
--- a/cmd/soroban-cli/src/commands/snapshot.rs
+++ b/cmd/soroban-cli/src/commands/snapshot.rs
@@ -3,10 +3,12 @@ use clap::{arg, Parser};
 use flate2::bufread::GzDecoder;
 use futures::TryStreamExt;
 use http::Uri;
+use io_tee::TeeReader;
 use soroban_ledger_snapshot::LedgerSnapshot;
 use std::{
     collections::HashSet,
-    io::{self, BufReader},
+    fs::OpenOptions,
+    io::{self, BufReader, Read},
     path::PathBuf,
     str::FromStr,
 };
@@ -24,7 +26,7 @@ use super::{
     config::{self, locator},
     network,
 };
-use crate::rpc;
+use crate::{commands::config::data, rpc};
 
 fn default_out_path() -> PathBuf {
     PathBuf::new().join("snapshot.json")
@@ -48,8 +50,8 @@ pub struct Cmd {
     /// Contract IDs to filter by.
     #[arg(long = "wasm-hash", help_heading = "FILTERS")]
     wasm_hashes: Vec<String>,
-    // #[command(flatten)]
-    // locator: locator::Args,
+    #[command(flatten)]
+    locator: locator::Args,
     // #[command(flatten)]
     // network: network::Args,
 }
@@ -158,47 +160,71 @@ impl Cmd {
         };
 
         for (i, bucket) in buckets.iter().enumerate() {
-            let bucket_0 = &bucket[0..=1];
-            let bucket_1 = &bucket[2..=3];
-            let bucket_2 = &bucket[4..=5];
-            let bucket_url = format!(
-                "{BASE_URL}/bucket/{bucket_0}/{bucket_1}/{bucket_2}/bucket-{bucket}.xdr.gz"
-            );
-            print!("🪣  Downloading bucket {i} {bucket_url}");
-            let bucket_url = Uri::from_str(&bucket_url).unwrap();
+            let cache_path = data::bucket_dir()
+                .unwrap()
+                .join(format!("bucket-{bucket}.xdr"));
+
+            let (read, gz): (Box<dyn Read + Sync + Send>, bool) = if cache_path.exists() {
+                println!("🪣  Loading cached bucket {i} {bucket}");
+                let file = OpenOptions::new().read(true).open(&cache_path).unwrap();
+                (Box::new(file), false)
+            } else {
+                let bucket_0 = &bucket[0..=1];
+                let bucket_1 = &bucket[2..=3];
+                let bucket_2 = &bucket[4..=5];
+                let bucket_url = format!(
+                    "{BASE_URL}/bucket/{bucket_0}/{bucket_1}/{bucket_2}/bucket-{bucket}.xdr.gz"
+                );
+                print!("🪣  Downloading bucket {i} {bucket_url}");
+                let bucket_url = Uri::from_str(&bucket_url).unwrap();
 
-            let https = hyper_tls::HttpsConnector::new();
-            let response = hyper::Client::builder()
-                .build::<_, hyper::Body>(https)
-                .get(bucket_url)
-                .await
-                .unwrap();
+                let https = hyper_tls::HttpsConnector::new();
+                let response = hyper::Client::builder()
+                    .build::<_, hyper::Body>(https)
+                    .get(bucket_url)
+                    .await
+                    .unwrap();
 
-            if let Some(val) = response.headers().get("Content-Length") {
-                if let Ok(str) = val.to_str() {
-                    if let Ok(len) = str.parse::<u64>() {
-                        print!(" ({})", ByteSize(len));
+                if let Some(val) = response.headers().get("Content-Length") {
+                    if let Ok(str) = val.to_str() {
+                        if let Ok(len) = str.parse::<u64>() {
+                            print!(" ({})", ByteSize(len));
+                        }
                     }
                 }
-            }
-            println!();
+                println!();
 
-            let read = tokio_util::io::SyncIoBridge::new(
-                response
-                    .into_body()
-                    .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
-                    .into_async_read()
-                    .compat(),
-            );
+                let read = tokio_util::io::SyncIoBridge::new(
+                    response
+                        .into_body()
+                        .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
+                        .into_async_read()
+                        .compat(),
+                );
+                (Box::new(read), true)
+            };
 
+            let cache_path = cache_path.clone();
             let account_ids = self.account_ids.clone();
             let contract_ids = self.contract_ids.clone();
             let wasm_hashes = self.wasm_hashes.clone();
             (seen, snapshot) = tokio::task::spawn_blocking(move || {
                 let buf = BufReader::new(read);
-                let gz = GzDecoder::new(buf);
-                let buf = BufReader::new(gz);
-                let limited = &mut Limited::new(buf, Limits::none());
+                let read: Box<dyn Read + Sync + Send> = if gz {
+                    let gz = GzDecoder::new(buf);
+                    let buf = BufReader::new(gz);
+                    let file = OpenOptions::new()
+                        .create(true)
+                        .truncate(true)
+                        .write(true)
+                        .open(&cache_path)
+                        .unwrap();
+                    let tee = TeeReader::new(buf, file);
+                    Box::new(tee)
+                } else {
+                    Box::new(buf)
+                };
+                let limited = &mut Limited::new(read, Limits::none());
                 let sz = Frame::<BucketEntry>::read_xdr_iter(limited);
                 let mut count_saved = 0;
                 for entry in sz {