diff --git a/Cargo.lock b/Cargo.lock
index ad5fb4f..0f86bb5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -97,53 +97,14 @@ version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
-[[package]]
-name = "app-demo-adapter-axum"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "app-demo-core",
- "axum",
- "edgezero-adapter-axum",
- "edgezero-core",
- "log",
- "simple_logger",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "app-demo-adapter-cloudflare"
-version = "0.1.0"
-dependencies = [
- "app-demo-core",
- "edgezero-adapter-cloudflare",
- "edgezero-core",
- "worker",
-]
-
-[[package]]
-name = "app-demo-adapter-fastly"
-version = "0.1.0"
-dependencies = [
- "app-demo-core",
- "edgezero-adapter-fastly",
- "edgezero-core",
- "fastly",
- "log",
- "once_cell",
-]
-
 [[package]]
 name = "app-demo-core"
 version = "0.1.0"
 dependencies = [
- "async-trait",
  "bytes",
  "edgezero-core",
  "futures",
  "serde",
- "serde_json",
 ]
 
 [[package]]
@@ -817,6 +778,7 @@ dependencies = [
  "tower-service",
  "tracing",
  "validator",
+ "web-time",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index abc3c3f..1e2806b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,11 +7,8 @@ members = [
     "crates/edgezero-cli",
     "crates/edgezero-core",
     "crates/edgezero-macros",
-    "examples/app-demo/crates/app-demo-adapter-cloudflare",
-    "examples/app-demo/crates/app-demo-adapter-axum",
-    "examples/app-demo/crates/app-demo-core",
-    "examples/app-demo/crates/app-demo-adapter-fastly",
 ]
+exclude = ["examples/app-demo"]
 resolver = "2"
 
 [workspace.package]
@@ -22,8 +19,11 @@ license = "Apache-2.0"
 
 [workspace.dependencies]
 anyhow = "1"
-app-demo-core = { path = "examples/app-demo/crates/app-demo-core" }
-async-compression = { version = "0.4", features = ["futures-io", "gzip", "brotli"] }
+async-compression = { version = "0.4", features = [
+    "futures-io",
+    "gzip",
+    "brotli",
+] }
 async-stream = "0.3"
 async-trait = "0.1"
 axum = { version = "0.8", default-features = true }
@@ -63,4 +63,5 @@ tower-service = "0.3"
 tracing = "0.1"
 validator = { version = "0.20", features = ["derive"] }
 walkdir = { version = "2" }
+web-time = "1"
 worker = { version = "0.7", features = ["http"] }
diff --git a/crates/edgezero-core/Cargo.toml b/crates/edgezero-core/Cargo.toml
index 70a38ea..9ddd1fe 100644
--- a/crates/edgezero-core/Cargo.toml
+++ b/crates/edgezero-core/Cargo.toml
@@ -26,6 +26,7 @@ tower-service = { workspace = true }
 tracing = { workspace = true }
 validator = { workspace = true }
 log = { workspace = true }
+web-time = { workspace = true }
 
 [dev-dependencies]
 brotli = { workspace = true }
diff --git a/crates/edgezero-core/src/middleware.rs b/crates/edgezero-core/src/middleware.rs
index 146ff92..de8582d 100644
--- a/crates/edgezero-core/src/middleware.rs
+++ b/crates/edgezero-core/src/middleware.rs
@@ -1,6 +1,6 @@
 use std::future::Future;
 use std::sync::Arc;
-use std::time::Instant;
+use web_time::Instant;
 
 use async_trait::async_trait;
 
diff --git a/examples/app-demo/Cargo.lock b/examples/app-demo/Cargo.lock
index 2c0846d..1f928f4 100644
--- a/examples/app-demo/Cargo.lock
+++ b/examples/app-demo/Cargo.lock
@@ -373,6 +373,12 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
 [[package]]
 name = "cc"
 version = "1.2.55"
@@ -663,6 +669,7 @@ dependencies = [
  "tower-service",
  "tracing",
  "validator",
+ "web-time",
 ]
 
 [[package]]
diff --git a/examples/app-demo/Cargo.toml b/examples/app-demo/Cargo.toml
index 8b31521..c0d3fed 100644
--- a/examples/app-demo/Cargo.toml
+++ b/examples/app-demo/Cargo.toml
@@ -1,9 +1,9 @@
 [workspace]
 members = [
-  "crates/app-demo-core",
-  "crates/app-demo-adapter-fastly",
-  "crates/app-demo-adapter-cloudflare",
-  "crates/app-demo-adapter-axum",
+    "crates/app-demo-core",
+    "crates/app-demo-adapter-fastly",
+    "crates/app-demo-adapter-cloudflare",
+    "crates/app-demo-adapter-axum",
 ]
 resolver = "2"
 
@@ -18,7 +18,10 @@ edgezero-adapter-cloudflare = { path = "../../crates/edgezero-adapter-cloudflare
 edgezero-adapter-fastly = { path = "../../crates/edgezero-adapter-fastly" }
 edgezero-core = { path = "../../crates/edgezero-core" }
 fastly = "0.11"
-futures = { version = "0.3", default-features = false, features = ["std", "executor"] }
+futures = { version = "0.3", default-features = false, features = [
+    "std",
+    "executor",
+] }
 log = "0.4"
 once_cell = "1"
 serde = { version = "1", features = ["derive"] }