diff --git a/classes/cargo_util.bbclass b/classes/cargo_util.bbclass
index 81d4c85..29bd695 100644
--- a/classes/cargo_util.bbclass
+++ b/classes/cargo_util.bbclass
@@ -91,8 +91,8 @@ cargo_util_do_compile () {
 	cd "${B}"
 
 	# prevent cargo from trying to fetch down new data
-	mkdir -p "${WORKDIR}/cargo_home/registry/index/"
-	touch "${WORKDIR}/cargo_home/registry/index/.cargo-index-lock"
+	mkdir -p "${WORKDIR}/cargo_home/registry/index/github.com-1ecc6299db9ec823"
+	touch "${WORKDIR}/cargo_home/registry/index/github.com-1ecc6299db9ec823/.cargo-index-lock"
 
 	oe_cargo_fix_env
 	oe_cargo_build
diff --git a/lib/crate.py b/lib/crate.py
index be626fc..3197037 100644
--- a/lib/crate.py
+++ b/lib/crate.py
@@ -35,7 +35,8 @@ class Crate(Wget):
 
     def _cargo_path(self, rootdir, component):
         # TODO: make this less brittle
-        repo = "github.com-88ac128001ac3a9a"
+        # This can go away entirely once we can build a cargo that supports source-replacement
+        repo = "github.com-1ecc6299db9ec823"
         return os.path.join(rootdir, "cargo_home", "registry", component, repo)
 
     def _cargo_src_path(self, rootdir):