diff --git a/test/porousmediumflow/2p2c/implicit/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/CMakeLists.txt
index 21ddf95c681508f0ab3346ab26c83eb174a621f1..8f8bd5a20c8270967076229820aed6ba8d176115 100644
--- a/test/porousmediumflow/2p2c/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/2p2c/implicit/CMakeLists.txt
@@ -1,9 +1,9 @@
 add_input_file_links()
 
-# isothermal tests
+# isothermal tests without caching
 dune_add_test(NAME test_2p2c_box
               SOURCES test_2p2c_fv.cc
-              COMPILE_DEFINITIONS TYPETAG=InjectionBoxTypeTag
+              COMPILE_DEFINITIONS TYPETAG=InjectionBoxTypeTag ENABLECACHING=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/injectionbox-reference.vtu
@@ -12,7 +12,7 @@ dune_add_test(NAME test_2p2c_box
 
 dune_add_test(NAME test_2p2c_tpfa
               SOURCES test_2p2c_fv.cc
-              COMPILE_DEFINITIONS TYPETAG=InjectionCCTpfaTypeTag
+              COMPILE_DEFINITIONS TYPETAG=InjectionCCTpfaTypeTag ENABLECACHING=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/injectioncc-reference.vtu
@@ -21,13 +21,41 @@ dune_add_test(NAME test_2p2c_tpfa
 
 dune_add_test(NAME test_2p2c_mpfa
               SOURCES test_2p2c_fv.cc
-              COMPILE_DEFINITIONS TYPETAG=InjectionCCMpfaTypeTag
+              COMPILE_DEFINITIONS TYPETAG=InjectionCCMpfaTypeTag ENABLECACHING=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/injectioncc-reference.vtu
                                ${CMAKE_CURRENT_BINARY_DIR}/injection_mpfa-00008.vtu
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_mpfa test_2p2c_fv.input -Problem.Name injection_mpfa")
 
+# isothermal tests with caching
+dune_add_test(NAME test_2p2c_box_caching
+              SOURCES test_2p2c_fv.cc
+              COMPILE_DEFINITIONS TYPETAG=InjectionBoxTypeTag ENABLECACHING=1
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/test/references/injectionbox-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/injection_box-00008.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_box_caching test_2p2c_fv.input -Problem.Name injection_box")
+
+dune_add_test(NAME test_2p2c_tpfa_caching
+              SOURCES test_2p2c_fv.cc
+              COMPILE_DEFINITIONS TYPETAG=InjectionCCTpfaTypeTag ENABLECACHING=1
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/test/references/injectioncc-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/injection_tpfa-00008.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_tpfa_caching test_2p2c_fv.input -Problem.Name injection_tpfa")
+
+dune_add_test(NAME test_2p2c_mpfa_caching
+              SOURCES test_2p2c_fv.cc
+              COMPILE_DEFINITIONS TYPETAG=InjectionCCMpfaTypeTag ENABLECACHING=1
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/test/references/injectioncc-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/injection_mpfa-00008.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_mpfa_caching test_2p2c_fv.input -Problem.Name injection_mpfa")
+
 # non-isothermal tests
 dune_add_test(NAME test_2p2cni_box
               SOURCES test_2p2c_fv.cc
diff --git a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
index 1dffdf9e509488840c3c11afb6c738748e7daf24..a1420e0e560b9cb253ff9b41b99a176192c41b93 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
@@ -60,6 +60,11 @@ SET_TYPE_PROP(InjectionTypeTag,
 
 // Define whether mole(true) or mass (false) fractions are used
 SET_BOOL_PROP(InjectionTypeTag, UseMoles, true);
+
+// Enable caching or not (reference solutions created without caching)
+SET_BOOL_PROP(InjectionTypeTag, EnableFVGridGeometryCache, ENABLECACHING);
+SET_BOOL_PROP(InjectionTypeTag, EnableGridVolumeVariablesCache, ENABLECACHING);
+SET_BOOL_PROP(InjectionTypeTag, EnableGridFluxVariablesCache, ENABLECACHING);
 }