diff --git a/codex-rs/codex-mcp/src/codex_apps_cache.rs b/codex-rs/codex-mcp/src/codex_apps_cache.rs
deleted file mode 100644
index 1350262736..0000000000
--- a/codex-rs/codex-mcp/src/codex_apps_cache.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-//! Compatibility names for the connector runtime snapshot manager.
-
-pub use crate::connector_runtime::CodexAppsToolsCache;
-pub(crate) use crate::connector_runtime::CodexAppsToolsCacheContext;
-pub use crate::connector_runtime::CodexAppsToolsCacheKey;
-pub(crate) use crate::connector_runtime::CodexAppsToolsFetchSource;
-pub use crate::connector_runtime::codex_apps_tools_cache_key;
-pub(crate) use crate::connector_runtime::load_startup_cached_codex_apps_server_info;
diff --git a/codex-rs/codex-mcp/src/connection_manager.rs b/codex-rs/codex-mcp/src/connection_manager.rs
index d109fbbfda..d7c14a6006 100644
--- a/codex-rs/codex-mcp/src/connection_manager.rs
+++ b/codex-rs/codex-mcp/src/connection_manager.rs
@@ -14,9 +14,9 @@ use std::time::Duration;
 use std::time::Instant;
 
 use crate::McpAuthStatusEntry;
-use crate::codex_apps_cache::CodexAppsToolsCache;
-use crate::codex_apps_cache::CodexAppsToolsCacheKey;
-use crate::codex_apps_cache::CodexAppsToolsFetchSource;
+use crate::connector_runtime::CodexAppsToolsCache;
+use crate::connector_runtime::CodexAppsToolsCacheKey;
+use crate::connector_runtime::CodexAppsToolsFetchSource;
 use crate::elicitation::ElicitationRequestManager;
 use crate::elicitation::ElicitationRequestRouter;
 use crate::elicitation::ElicitationReviewerHandle;
diff --git a/codex-rs/codex-mcp/src/connection_manager_tests.rs b/codex-rs/codex-mcp/src/connection_manager_tests.rs
index 6b4a3ae554..88b1857cc3 100644
--- a/codex-rs/codex-mcp/src/connection_manager_tests.rs
+++ b/codex-rs/codex-mcp/src/connection_manager_tests.rs
@@ -1,6 +1,6 @@
 use super::*;
-use crate::codex_apps_cache::CodexAppsToolsCache;
-use crate::codex_apps_cache::CodexAppsToolsCacheContext;
+use crate::connector_runtime::CodexAppsToolsCache;
+use crate::connector_runtime::CodexAppsToolsCacheContext;
 use crate::declared_openai_file_input_param_names;
 use crate::elicitation::ElicitationLifecycle;
 use crate::elicitation::ElicitationRequestManager;
diff --git a/codex-rs/codex-mcp/src/lib.rs b/codex-rs/codex-mcp/src/lib.rs
index 5e667e7c36..72ebca840a 100644
--- a/codex-rs/codex-mcp/src/lib.rs
+++ b/codex-rs/codex-mcp/src/lib.rs
@@ -37,12 +37,12 @@ pub use auth_elicitation::auth_elicitation_id;
 pub use auth_elicitation::build_auth_elicitation;
 pub use auth_elicitation::build_auth_elicitation_plan;
 pub use auth_elicitation::connector_auth_failure_from_tool_result;
-pub use codex_apps_cache::CodexAppsToolsCache;
-pub use codex_apps_cache::CodexAppsToolsCacheKey;
-pub use codex_apps_cache::codex_apps_tools_cache_key;
+pub use connector_runtime::CodexAppsToolsCache;
+pub use connector_runtime::CodexAppsToolsCacheKey;
 pub use connector_runtime::ConnectorRuntimeContextKey;
 pub use connector_runtime::ConnectorRuntimeManager;
 pub use connector_runtime::ConnectorRuntimeSnapshot;
+pub use connector_runtime::codex_apps_tools_cache_key;
 pub use connector_runtime::connector_runtime_context_key;
 pub use mcp::codex_apps_mcp_server_config;
 pub use mcp::configured_mcp_servers;
@@ -82,7 +82,6 @@ pub use tools::declared_openai_file_input_param_names;
 pub(crate) mod auth_elicitation;
 mod catalog;
 pub(crate) mod codex_apps;
-pub(crate) mod codex_apps_cache;
 pub(crate) mod connection_manager;
 mod connector_runtime;
 mod connector_runtime_persistence;
diff --git a/codex-rs/codex-mcp/src/mcp/mod.rs b/codex-rs/codex-mcp/src/mcp/mod.rs
index 87ea25dd9f..531250316a 100644
--- a/codex-rs/codex-mcp/src/mcp/mod.rs
+++ b/codex-rs/codex-mcp/src/mcp/mod.rs
@@ -44,9 +44,9 @@ use serde_json::Value;
 use tokio_util::sync::CancellationToken;
 
 use crate::ResolvedMcpCatalog;
-use crate::codex_apps_cache::CodexAppsToolsCache;
-use crate::codex_apps_cache::codex_apps_tools_cache_key;
 use crate::connection_manager::McpConnectionManager;
+use crate::connector_runtime::CodexAppsToolsCache;
+use crate::connector_runtime::codex_apps_tools_cache_key;
 use crate::runtime::McpRuntimeContext;
 use crate::server::EffectiveMcpServer;
 
diff --git a/codex-rs/codex-mcp/src/rmcp_client.rs b/codex-rs/codex-mcp/src/rmcp_client.rs
index bed99c2f86..4c9a6aaafa 100644
--- a/codex-rs/codex-mcp/src/rmcp_client.rs
+++ b/codex-rs/codex-mcp/src/rmcp_client.rs
@@ -21,9 +21,9 @@ use std::time::Instant;
 use crate::codex_apps::normalize_codex_apps_callable_name;
 use crate::codex_apps::normalize_codex_apps_callable_namespace;
 use crate::codex_apps::normalize_codex_apps_tool_title;
-use crate::codex_apps_cache::CodexAppsToolsCacheContext;
-use crate::codex_apps_cache::CodexAppsToolsFetchSource;
-use crate::codex_apps_cache::load_startup_cached_codex_apps_server_info;
+use crate::connector_runtime::CodexAppsToolsCacheContext;
+use crate::connector_runtime::CodexAppsToolsFetchSource;
+use crate::connector_runtime::load_startup_cached_codex_apps_server_info;
 use crate::elicitation::ElicitationRequestManager;
 use crate::mcp::CODEX_APPS_MCP_SERVER_NAME;
 use crate::mcp::ToolPluginProvenance;