diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/InformationServer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/InformationServer.java
index 2e54bdb46..e1b24d82b 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/InformationServer.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/InformationServer.java
@@ -181,4 +181,11 @@ public interface InformationServer extends InformationServerCollectionProvider
     String getBaseUrl();
 
     void flushContentStore() throws IOException;
+
+    /**
+     * Check if cascade tracking is enabled.
+     *
+     * @return true if cascade tracking is enabled (note that this is the default behaviour if not specified in the properties file).
+     */
+    boolean cascadeTrackingEnabled();
 }
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
index e5cd5f018..1008789cd 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
@@ -481,11 +481,8 @@ public class SolrInformationServer implements InformationServer
         return this.adminHandler;
     }
 
-    /**
-     * Check if cascade tracking is enabled.
-     *
-     * @return true if cascade tracking is enabled (note that this is the default behaviour if not specified in the properties file).
-     */
+    /** {@inheritDoc} */
+    @Override
     public boolean cascadeTrackingEnabled()
     {
         String cascadeTrackerEnabledProp = ofNullable((String) props.get(CASCADE_TRACKER_ENABLED)).orElse("true");
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/MetadataTracker.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/MetadataTracker.java
index 3df245e4a..3a7773dd9 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/MetadataTracker.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/MetadataTracker.java
@@ -110,7 +110,7 @@ public class MetadataTracker extends CoreStatePublisher implements Tracker
         transactionDocsBatchSize = Integer.parseInt(p.getProperty("alfresco.transactionDocsBatchSize", "100"));
         nodeBatchSize = Integer.parseInt(p.getProperty("alfresco.nodeBatchSize", "10"));
         threadHandler = new ThreadHandler(p, coreName, "MetadataTracker");
-        cascadeTrackerEnabled = ((SolrInformationServer) informationServer).cascadeTrackingEnabled();
+        cascadeTrackerEnabled = informationServer.cascadeTrackingEnabled();
         
         // In order to apply performance optimizations, checking the availability of Repo Web Scripts is required.
         // As these services are available from ACS 6.2