diff --git a/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/DataGatheringScheduler.java b/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/DataGatheringScheduler.java
index 4abc73a0c82..d4a61e543dc 100644
--- a/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/DataGatheringScheduler.java
+++ b/modules/dcache-info/src/main/java/org/dcache/services/info/gathers/DataGatheringScheduler.java
@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.Map;
 
+import dmg.cells.nucleus.CellLifeCycleAware;
 import dmg.cells.nucleus.EnvironmentAware;
 import dmg.cells.nucleus.UOID;
 
@@ -30,7 +31,7 @@
  * @author Paul Millar <paul.millar@desy.de>
  */
 
-public class DataGatheringScheduler implements Runnable, EnvironmentAware
+public class DataGatheringScheduler implements Runnable, EnvironmentAware, CellLifeCycleAware
 {
     private static final long FIVE_MINUTES = 5*60*1000;
     private static final Logger LOGGER_SCHED = LoggerFactory.getLogger(DataGatheringScheduler.class);
@@ -206,7 +207,8 @@ public String getStatus()
         }
     }
 
-    public synchronized void start()
+    @Override
+    public synchronized void afterStart()
     {
         checkState(_thread == null, "DataGatheringScheduler already started");
 
@@ -390,7 +392,8 @@ public String triggerActivity(String name)
      * Request that this thread sends no more requests
      * for data.
      */
-    public void shutdown()
+    @Override
+    public void beforeStop()
     {
         LOGGER_SCHED.debug("Requesting DGA Scheduler to shutdown.");
         synchronized (_activity) {
diff --git a/modules/dcache-info/src/main/resources/org/dcache/services/info/info.xml b/modules/dcache-info/src/main/resources/org/dcache/services/info/info.xml
index 147d1e765b2..3f735d4f045 100644
--- a/modules/dcache-info/src/main/resources/org/dcache/services/info/info.xml
+++ b/modules/dcache-info/src/main/resources/org/dcache/services/info/info.xml
@@ -62,8 +62,7 @@
   </bean>
 
 
-  <bean id="data-gathering-scheduler" class="org.dcache.services.info.gathers.DataGatheringScheduler"
-        init-method="start" destroy-method="shutdown">
+  <bean id="data-gathering-scheduler" class="org.dcache.services.info.gathers.DataGatheringScheduler">
       <property name="stateUpdateManager" ref="state-update-manager"/>
       <property name="messageMetadataRepository" ref="message-handler-chain"/>
       <property name="messageSender" ref="message-handler-chain"/>