diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref b/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
index 14253cbbcbbcc16377e2b961a35c698a917b6f24..89757b09a97a7a760ae09286305ae6fb945143bb 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling-basic-run-mc.ref
@@ -4,10 +4,6 @@ ApplicationMgr    SUCCESS
 ApplicationMgr       INFO Application Manager Configured successfully
 DetectorPersistencySvc                 INFO Added successfully Conversion service:XmlCnvSvc
 DetectorDataSvc                     SUCCESS Detector description database: git:/lhcb.xml
-MagneticFieldGridReader INFO  Opened magnetic field file:  DBASE/FieldMap/vXrYpZ/cdf//field.v5r0.c1.down.cdf
-MagneticFieldGridReader INFO  Opened magnetic field file:  DBASE/FieldMap/vXrYpZ/cdf//field.v5r0.c2.down.cdf
-MagneticFieldGridReader INFO  Opened magnetic field file:  DBASE/FieldMap/vXrYpZ/cdf//field.v5r0.c3.down.cdf
-MagneticFieldGridReader INFO  Opened magnetic field file:  DBASE/FieldMap/vXrYpZ/cdf//field.v5r0.c4.down.cdf
 NTupleSvc                              INFO Added stream file:DV-example-tupling-basic-ntp-run-mc.root as FILE1
 RootHistSvc                            INFO Writing ROOT histograms to: DV-example-tupling-basic-his-run-mc.root
 HistogramPersistencySvc                INFO Added successfully Conversion service:RootHistSvc
@@ -86,10 +82,10 @@ ToolSvc.LoKi::VertexFitter             INFO Number of counters : 2
  | "#iterations/Opt"                               |         6 |          0 |      0.0000 |      0.0000 |       0.0000 |       0.0000 |
 ToolSvc.PPFactoryHybridFactory         INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# loaded from PYTHON"                          |         1 |
+ | "# loaded from CACHE"                           |         1 |
 ToolSvc.TrackFunctorFactory            INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# loaded from PYTHON"                          |         1 |
+ | "# loaded from CACHE"                           |         1 |
 UnpackBestTracks                       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "# Unpacked Tracks"                             |        10 |       4101 |     410.10 |
diff --git a/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref b/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
index f8c72a2121f558492e206557a9719f03321053de..9e3f3e23c24eb529bf4604990eb205b006d4a6f5 100644
--- a/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
+++ b/DaVinciExamples/tests/refs/test_davinci_tupling_array_taggers.ref
@@ -2501,7 +2501,7 @@ ToolSvc.HltFactory                     INFO Number of counters : 1
  | "# loaded from PYTHON"                          |         1 |
 ToolSvc.PPFactoryHybridFactory         INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# loaded from PYTHON"                          |         1 |
+ | "# loaded from CACHE"                           |         1 |
 ToolSvc.TrackFunctorFactory            INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# loaded from PYTHON"                          |         1 |
+ | "# loaded from CACHE"                           |         1 |
diff --git a/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref b/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref
index 1af5a0f9819d486ae8ff3862dfab6f058514ddd1..8bd49407a2a823868e8c806f629fb0d5ecd34dcc 100644
--- a/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref
+++ b/DaVinciTests/tests/refs/test_davinci_funtuple_array.ref
@@ -2497,7 +2497,7 @@ ToolSvc.HltFactory                     INFO Number of counters : 1
  | "# loaded from PYTHON"                          |         1 |
 ToolSvc.PPFactoryHybridFactory         INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# loaded from PYTHON"                          |         1 |
+ | "# loaded from CACHE"                           |         1 |
 ToolSvc.TrackFunctorFactory            INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "# loaded from PYTHON"                          |         1 |
+ | "# loaded from CACHE"                           |         1 |
diff --git a/cmake/DaVinciDependencies.cmake b/cmake/DaVinciDependencies.cmake
index bb460406c062f66eddb2244f10c2106085d3517e..4eaa3b431152b2f42bd02b40247df2ab5f6d46e3 100644
--- a/cmake/DaVinciDependencies.cmake
+++ b/cmake/DaVinciDependencies.cmake
@@ -23,6 +23,7 @@ endif()
 
 # -- Public dependencies
 lhcb_find_package(Analysis REQUIRED)
+lhcb_find_package(Moore REQUIRED)
 
 find_data_package(AppConfig 3.0 REQUIRED)
 find_data_package(FieldMap 5.0 REQUIRED)
diff --git a/lhcbproject.yml b/lhcbproject.yml
index 6fb1ec7a8a8407f2987a1fa339cd8b1c321beb64..8a52546219d96a4f06332cacf3c2af27d53c09b9 100644
--- a/lhcbproject.yml
+++ b/lhcbproject.yml
@@ -3,3 +3,4 @@ name: DaVinci
 license: GPL-3.0-only
 dependencies:
   - Analysis
+  - Moore