diff --git a/i3pystatus/core/__init__.py b/i3pystatus/core/__init__.py
index e101b93..95ed22e 100644
--- a/i3pystatus/core/__init__.py
+++ b/i3pystatus/core/__init__.py
@@ -2,6 +2,7 @@
 import sys
 import os
 from threading import Thread
+from i3pystatus.core.imputil import ClassFinder
 
 from i3pystatus.core import io, util
 from i3pystatus.core.modules import Module, START_HOOKS
@@ -27,7 +28,7 @@ class Status:
         else:
             self.io = io.IOHandler(input_stream)
 
-        self.modules = util.ModuleList(self, Module)
+        self.modules = util.ModuleList(self, ClassFinder(Module))
 
     def register(self, module, *args, **kwargs):
         """Register a new module."""
diff --git a/i3pystatus/core/util.py b/i3pystatus/core/util.py
index 7e9ace5..8d80ad0 100644
--- a/i3pystatus/core/util.py
+++ b/i3pystatus/core/util.py
@@ -61,9 +61,9 @@ def round_dict(dic, places):
 
 
 class ModuleList(collections.UserList):
-    def __init__(self, status_handler, module_base):
+    def __init__(self, status_handler, class_finder):
         self.status_handler = status_handler
-        self.finder = ClassFinder(module_base)
+        self.finder = class_finder
         super().__init__()
 
     def append(self, module, *args, **kwargs):
diff --git a/i3pystatus/mkdocs.py b/i3pystatus/mkdocs.py
index 4b973c1..91eda06 100755
--- a/i3pystatus/mkdocs.py
+++ b/i3pystatus/mkdocs.py
@@ -118,7 +118,7 @@ def get_all(module_path, heading, finder=None, ignore=None):
         finder = ClassFinder(i3pystatus.Module)
 
     for name, module in get_modules(module_path):
-        classes = finder.search_module(module)
+        classes = finder.get_matching_classes(module)
         found = []
         for cls in classes:
             if cls.__name__ not in found:
diff --git a/tests/test_core_util.py b/tests/test_core_util.py
index d88c0b8..6f344ca 100644
--- a/tests/test_core_util.py
+++ b/tests/test_core_util.py
@@ -130,7 +130,7 @@ class ModuleListTests(unittest.TestCase):
 
     def setUp(self):
         self.status_handler = MagicMock()
-        self.ml = util.ModuleList(self.status_handler, self.ModuleBase)
+        self.ml = util.ModuleList(self.status_handler, ClassFinder(self.ModuleBase))
 
     def test_append_simple(self):
         module = self.ModuleBase()