diff --git a/Cargo.lock b/Cargo.lock
index 1bab72dc3b0..8ad05d1d635 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2611,8 +2611,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_account_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c6392faf8bc6ce3f36a136c52e0357c4fd1e64a4f0eb9834abd8c63b9b19cf"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "frc42_dispatch",
  "frc42_macros",
@@ -2628,8 +2627,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_cron_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fe305e8b1612eec1ba1b3c7dba62bc312d898606a5b9525a464d9c47139e70a"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "fvm_ipld_encoding",
  "fvm_shared 2.11.2",
@@ -2643,8 +2641,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_datacap_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a122d4735ab7d52ec38ca91bda8d56c0d1fea0a13ef9be70e2b5b0dd7d9f0a0b"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "fil_actors_shared",
  "frc42_dispatch",
@@ -2664,8 +2661,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_eam_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef468e409399faf23e6da95e27d5f7a27cac22ba7f6e5f41bf3d485309b936d"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "fil_actor_evm_state",
  "fvm_ipld_encoding",
@@ -2679,8 +2675,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_ethaccount_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8322c4de54e80ca761d82bf259dc3b1b2104de44008dcf2493078df1dd6f044d"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "fvm_ipld_encoding",
  "fvm_shared 3.13.2",
@@ -2693,8 +2688,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_evm_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90610613408cd84da78aeade27ea0f44158b03f5dd6d0d56bd47831543638e63"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "cid",
  "fil_actors_shared",
@@ -2714,8 +2708,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_init_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8db5cb637d20451009ebe905d592c235d8ce6fb8626f72f04e3851b4b7744496"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "anyhow",
  "cid",
@@ -2734,8 +2727,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_market_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb17e1b96534b072d76aa3f4717c2c618b3caf435dcb63f396335259b6eb2e0"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "anyhow",
  "cid",
@@ -2762,8 +2754,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_miner_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302b9ba04c75efde657c5e06e1033e1585288119da437f29d7e22c5328a6b996"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "anyhow",
  "bitflags 2.9.4",
@@ -2793,8 +2784,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_multisig_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84ced2ed760180cb09a03ae0438ed9fb82b495bba97c2da8d7ac5ef61c49b7bb"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "anyhow",
  "cid",
@@ -2817,8 +2807,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_paych_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf6352ea0452bc6dc533528e5c4ff1267f9a94baaf1b11e19145c103a6773780"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "cid",
  "fil_actors_shared",
@@ -2836,8 +2825,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_power_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97b98196fc3da0e31c00686c79f922eb8805a06a903f576dc9fb6b684ee6845"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "anyhow",
  "cid",
@@ -2860,8 +2848,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_reward_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33020cb0a086cff43d94c63034e98b960ff331dc5adc31fc931b695e181f5919"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "fil_actors_shared",
  "fvm_ipld_encoding",
@@ -2877,8 +2864,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_system_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26709383303cd27da59f1bd5361249a8043f736721e46b3d5ae674d4f0ff93c"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "cid",
  "fil_actors_shared",
@@ -2895,8 +2881,7 @@ dependencies = [
 [[package]]
 name = "fil_actor_verifreg_state"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92f8794eab7e2da54225f26ec65bdb2d7565b731c39d661771a516871594354b"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "anyhow",
  "cid",
@@ -2917,8 +2902,7 @@ dependencies = [
 [[package]]
 name = "fil_actors_shared"
 version = "24.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0017d2215c114878850e25cfffea5d475abbba72e972fa77c15ed46d6a6be6f8"
+source = "git+https://github.com/ChainSafe/fil-actor-states.git?branch=hm%2Fcacheless-hamt#e583f09b77d7431567c5c6ff87395c7b86f45d19"
 dependencies = [
  "anyhow",
  "cid",
@@ -3786,8 +3770,7 @@ dependencies = [
 [[package]]
 name = "fvm_ipld_hamt"
 version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e92fa6ad9ebdb821f7d3183666a94b6fabd6640d5c83ce1cd850865746d2e4db"
+source = "git+https://github.com/hanabi1224/ref-fvm.git?branch=hm%2Fhamt-cacheless-iter-patch#0e074c35f944696a0e365983f64d07a3d97f1a0b"
 dependencies = [
  "anyhow",
  "byteorder",
diff --git a/Cargo.toml b/Cargo.toml
index 575ea3e2c1d..0078b83e276 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,9 @@ exclude = [".config", ".github", ".maintain", "documentation", "scripts", "inter
 [lib]
 name = "forest"
 
+[patch.crates-io]
+fvm_ipld_hamt = { git = "https://github.com/hanabi1224/ref-fvm.git", branch = "hm/hamt-cacheless-iter-patch" }
+
 [workspace.dependencies]
 anyhow = "1"
 cid = { version = "0.11", default-features = false, features = ["std"] }
@@ -68,22 +71,24 @@ educe = { version = "0.6.0", features = ["Debug"], default-features = false }
 enumflags2 = "0.7"
 ethereum-types = { version = "0.15", features = ["ethbloom"] }
 ez-jsonrpc-types = "0.5"
-fil_actor_account_state = { version = "24" }
-fil_actor_cron_state = { version = "24" }
-fil_actor_datacap_state = { version = "24" }
-fil_actor_eam_state = { version = "24" }
-fil_actor_ethaccount_state = { version = "24" }
-fil_actor_evm_state = { version = "24" }
-fil_actor_init_state = { version = "24" }
-fil_actor_market_state = { version = "24" }
-fil_actor_miner_state = { version = "24" }
-fil_actor_multisig_state = { version = "24" }
-fil_actor_paych_state = { version = "24" }
-fil_actor_power_state = { version = "24" }
-fil_actor_reward_state = { version = "24" }
-fil_actor_system_state = { version = "24" }
-fil_actor_verifreg_state = { version = "24" }
-fil_actors_shared = { version = "24", features = ["json"] }
+fil_actor_account_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_cron_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_datacap_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_eam_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_ethaccount_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_evm_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_init_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_market_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_miner_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_multisig_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_paych_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_power_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_reward_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_system_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actor_verifreg_state = { version = "24", git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
+fil_actors_shared = { version = "24", features = [
+  "json",
+], git = "https://github.com/ChainSafe/fil-actor-states.git", branch = "hm/cacheless-hamt" }
 flate2 = "1"
 flume = { workspace = true }
 fs_extra = "1"