diff --git a/examples/bin/examples/indexing/wikipedia_realtime_task.json b/examples/bin/examples/indexing/wikipedia_realtime_task.json
index 0068176a1a7..3365c50368c 100644
--- a/examples/bin/examples/indexing/wikipedia_realtime_task.json
+++ b/examples/bin/examples/indexing/wikipedia_realtime_task.json
@@ -66,6 +66,6 @@
     "timeDimension": "timestamp",
     "timeFormat": "iso"
   },
-  "windowPeriod": "PT0m",
-  "segmentGranularity": "minute"
+  "windowPeriod": "PT10m",
+  "segmentGranularity": "hour"
 }
\ No newline at end of file
diff --git a/services/src/main/java/io/druid/cli/CliBroker.java b/services/src/main/java/io/druid/cli/CliBroker.java
index c67d44a64ab..2381c13d282 100644
--- a/services/src/main/java/io/druid/cli/CliBroker.java
+++ b/services/src/main/java/io/druid/cli/CliBroker.java
@@ -83,7 +83,7 @@ public class CliBroker extends ServerRunnable
             binder.bind(TimelineServerView.class).to(BrokerServerView.class).in(LazySingleton.class);
 
             binder.bind(Cache.class).toProvider(CacheProvider.class).in(ManageLifecycle.class);
-            JsonConfigProvider.bind(binder, "druid.broker.cache", CacheProvider.class); // TODO: delete broker
+            JsonConfigProvider.bind(binder, "druid.broker.cache", CacheProvider.class);
             JsonConfigProvider.bind(binder, "druid.broker.cache", CacheConfig.class);
             JsonConfigProvider.bind(binder, "druid.broker.select.tier", TierSelectorStrategy.class);
             JsonConfigProvider.bind(binder, "druid.broker.select.tier.custom", CustomTierSelectorStrategyConfig.class);
diff --git a/services/src/main/java/io/druid/cli/CliHistorical.java b/services/src/main/java/io/druid/cli/CliHistorical.java
index 577c5bf68e6..6d4152b9226 100644
--- a/services/src/main/java/io/druid/cli/CliHistorical.java
+++ b/services/src/main/java/io/druid/cli/CliHistorical.java
@@ -81,7 +81,7 @@ public class CliHistorical extends ServerRunnable
             LifecycleModule.register(binder, Server.class);
 
             binder.bind(Cache.class).toProvider(CacheProvider.class).in(ManageLifecycle.class);
-            JsonConfigProvider.bind(binder, "druid.historical.cache", CacheProvider.class); //TODO: delete historical
+            JsonConfigProvider.bind(binder, "druid.historical.cache", CacheProvider.class);
             JsonConfigProvider.bind(binder, "druid.historical.cache", CacheConfig.class);
             MetricsModule.register(binder, CacheMonitor.class);
           }