diff --git a/gateway/src/main/java/com/lyft/data/gateway/module/GatewayProviderModule.java b/gateway/src/main/java/com/lyft/data/gateway/module/GatewayProviderModule.java
index 6237667f..baad8f71 100644
--- a/gateway/src/main/java/com/lyft/data/gateway/module/GatewayProviderModule.java
+++ b/gateway/src/main/java/com/lyft/data/gateway/module/GatewayProviderModule.java
@@ -54,7 +54,7 @@ protected ProxyHandler getProxyHandler() {
             .meter(getConfiguration().getRequestRouter().getName() + ".requests");
     // Return the Proxy Handler for RequestRouter.
     return new QueryIdCachingProxyHandler(
-        queryHistoryManager, routingManager, getApplicationPort(), requestMeter);
+        getQueryHistoryManager(), getRoutingManager(), getApplicationPort(), requestMeter);
   }
 
   @Provides
@@ -90,4 +90,10 @@ public GatewayBackendManager getGatewayBackendManager() {
   public QueryHistoryManager getQueryHistoryManager() {
     return this.queryHistoryManager;
   }
+
+  @Provides
+  @Singleton
+  public RoutingManager getRoutingManager() {
+    return this.routingManager;
+  }
 }