diff --git a/dumux/freeflow/navierstokes/mass/1p/model.hh b/dumux/freeflow/navierstokes/mass/1p/model.hh
index 91aae0039856bc099881f96cc3d51c66c5aa9391..d37c58f68005290a61d1839e63f512e90d341c43 100644
--- a/dumux/freeflow/navierstokes/mass/1p/model.hh
+++ b/dumux/freeflow/navierstokes/mass/1p/model.hh
@@ -201,14 +201,6 @@ public:
     >;
 };
 
-template<class TypeTag>
-struct FluxVariablesCache<TypeTag, TTag::NavierStokesMassOneP>
-{ using type = FluxVariablesCaching::EmptyCache<GetPropType<TypeTag, Properties::Scalar>>; };
-
-template<class TypeTag>
-struct FluxVariablesCacheFiller<TypeTag, TTag::NavierStokesMassOneP>
-{ using type = FluxVariablesCaching::EmptyCacheFiller; };
-
 // ! The specific I/O fields
 template<class TypeTag>
 struct IOFields<TypeTag, TTag::NavierStokesMassOneP> { using type = NavierStokesIOFields; };
diff --git a/dumux/freeflow/navierstokes/momentum/model.hh b/dumux/freeflow/navierstokes/momentum/model.hh
index 2dc4a8378879140f2ba1cb9546cfe751c67ce1eb..6e6e6a7878d7194e4ed34c00cc2a6aca6ecd2b0e 100644
--- a/dumux/freeflow/navierstokes/momentum/model.hh
+++ b/dumux/freeflow/navierstokes/momentum/model.hh
@@ -61,7 +61,6 @@
 #include <dumux/material/fluidstates/immiscible.hh>
 #include <dumux/discretization/method.hh>
 #include <dumux/flux/fourierslaw.hh>
-#include <dumux/flux/fluxvariablescaching.hh>
 
 namespace Dumux {
 
@@ -204,12 +203,6 @@ public:
 template<class TypeTag>
 struct FluxVariables<TypeTag, TTag::NavierStokesMomentum> { using type = NavierStokesMomentumFluxVariables<TypeTag>; };
 
-template<class TypeTag>
-struct FluxVariablesCache<TypeTag, TTag::NavierStokesMomentum> { using type = FluxVariablesCaching::EmptyCache<GetPropType<TypeTag, Properties::Scalar>>; };
-
-template<class TypeTag>
-struct FluxVariablesCacheFiller<TypeTag, TTag::NavierStokesMomentum> { using type = FluxVariablesCaching::EmptyCacheFiller; };
-
 template<class TypeTag>
 struct CouplingManager<TypeTag, TTag::NavierStokesMomentum>
 {
diff --git a/dumux/freeflow/properties.hh b/dumux/freeflow/properties.hh
index 4b7af1936d5a5c65fa85b27c112e5f04acbfd657..8036b946cd38c5f2b2caaca940d68c43b58312fe 100644
--- a/dumux/freeflow/properties.hh
+++ b/dumux/freeflow/properties.hh
@@ -28,7 +28,7 @@
 #include <dumux/common/properties.hh>
 #include <dumux/common/properties/model.hh>
 #include <dumux/flux/fourierslaw.hh>
-#include <dumux/flux/fluxvariablescaching.hh>
+
 #include "turbulencemodel.hh"
 #include "spatialparams.hh"
 
@@ -41,16 +41,6 @@ namespace TTag {
 struct FreeFlow { using InheritsFrom = std::tuple<ModelProperties>; };
 } // end namespace TTag
 
-//! The flux variables cache class, by default the one for free flow
-template<class TypeTag>
-struct FluxVariablesCache<TypeTag, TTag::FreeFlow> { using type = FluxVariablesCaching::EmptyCache<GetPropType<TypeTag, Properties::Scalar>>; };
-
-//! The flux variables cache filler (FluxVariablesCache is the data type,
-//! the filler knows how to build up the caches for the stencil efficiently)
-//! For the free flow model there is no need for a cache and filler
-template<class TypeTag>
-struct FluxVariablesCacheFiller<TypeTag, TTag::FreeFlow> { using type = FluxVariablesCaching::EmptyCacheFiller; };
-
 //! Use Fourier's Law as default heat conduction type
 template<class TypeTag>
 struct HeatConductionType<TypeTag, TTag::FreeFlow> { using type = FouriersLaw<TypeTag>; };
diff --git a/dumux/freeflow/shallowwater/model.hh b/dumux/freeflow/shallowwater/model.hh
index 85d702fb9c29a553124b02ee6ba756ee1bece1d1..d87ccde78b754f1afe348f6df8db513ff0bc2a5a 100644
--- a/dumux/freeflow/shallowwater/model.hh
+++ b/dumux/freeflow/shallowwater/model.hh
@@ -76,7 +76,6 @@
 
 #include <dumux/flux/shallowwaterflux.hh>
 #include <dumux/flux/shallowwaterviscousflux.hh>
-#include <dumux/flux/fluxvariablescaching.hh>
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/1pliquid.hh>
 
@@ -157,14 +156,6 @@ public:
     using type = ShallowWaterVolumeVariables<Traits>;
 };
 
-template<class TypeTag>
-struct FluxVariablesCache<TypeTag, TTag::ShallowWater>
-{ using type = FluxVariablesCaching::EmptyCache< GetPropType<TypeTag, Properties::Scalar> >; };
-
-template<class TypeTag>
-struct FluxVariablesCacheFiller<TypeTag, TTag::ShallowWater>
-{ using type = FluxVariablesCaching::EmptyCacheFiller; };
-
 template<class TypeTag>
 struct IOFields<TypeTag, TTag::ShallowWater>
 { using type = ShallowWaterIOFields; };