diff --git a/lib/searchkick/bulk_reindex_job.rb b/lib/searchkick/bulk_reindex_job.rb
index 2b61341..6a39792 100644
--- a/lib/searchkick/bulk_reindex_job.rb
+++ b/lib/searchkick/bulk_reindex_job.rb
@@ -14,9 +14,8 @@ module Searchkick
       relation = Searchkick.load_records(relation, record_ids)
       relation = relation.search_import if relation.respond_to?(:search_import)
 
-      # TODO expose functionality on index
-      index.send(:record_indexer).reindex(relation, mode: :inline, method_name: method_name, full: false)
-      index.send(:relation_indexer).batch_completed(batch_id) if batch_id
+      RecordIndexer.new(index).reindex(relation, mode: :inline, method_name: method_name, full: false)
+      RelationIndexer.new(index).batch_completed(batch_id) if batch_id
     end
   end
 end
diff --git a/lib/searchkick/index.rb b/lib/searchkick/index.rb
index d34556c..49cf6fc 100644
--- a/lib/searchkick/index.rb
+++ b/lib/searchkick/index.rb
@@ -301,10 +301,6 @@ module Searchkick
       @relation_indexer ||= RelationIndexer.new(self)
     end
 
-    def record_indexer
-      @record_indexer ||= RecordIndexer.new(self)
-    end
-
     def index_settings
       settings.values.first["settings"]["index"]
     end
diff --git a/lib/searchkick/model.rb b/lib/searchkick/model.rb
index 6c4fabc..4776fd7 100644
--- a/lib/searchkick/model.rb
+++ b/lib/searchkick/model.rb
@@ -28,7 +28,7 @@ module Searchkick
         def reindex(method_name = nil, mode: nil, refresh: false)
           mode ||= Searchkick.callbacks_value || self.class.searchkick_index.options[:callbacks] || true
           mode = :inline if mode == :bulk
-          result = self.class.searchkick_index.send(:record_indexer).reindex([self], mode: mode, method_name: method_name, single: true)
+          result = RecordIndexer.new(self.class.searchkick_index).reindex([self], mode: mode, method_name: method_name, single: true)
           self.class.searchkick_index.refresh if refresh
           result
         end
diff --git a/lib/searchkick/process_batch_job.rb b/lib/searchkick/process_batch_job.rb
index 9603f64..22d96b4 100644
--- a/lib/searchkick/process_batch_job.rb
+++ b/lib/searchkick/process_batch_job.rb
@@ -14,7 +14,7 @@ module Searchkick
         end
 
       relation = Searchkick.scope(model)
-      index.send(:record_indexer).reindex_items(relation, items, method_name: nil)
+      RecordIndexer.new(index).reindex_items(relation, items, method_name: nil)
     end
   end
 end
diff --git a/lib/searchkick/reindex_v2_job.rb b/lib/searchkick/reindex_v2_job.rb
index d5308d2..fc9cc4c 100644
--- a/lib/searchkick/reindex_v2_job.rb
+++ b/lib/searchkick/reindex_v2_job.rb
@@ -11,7 +11,7 @@ module Searchkick
       # but keep for now for backwards compatibility
       model = model.unscoped if model.respond_to?(:unscoped)
       items = [{id: id, routing: routing}]
-      index.send(:record_indexer).reindex_items(model, items, method_name: method_name, single: true)
+      RecordIndexer.new(index).reindex_items(model, items, method_name: method_name, single: true)
     end
   end
 end
--
libgit2 0.21.0