diff --git a/generator/feature_maker.cpp b/generator/feature_maker.cpp
index 8c0cc1a5e0..22e0768dd9 100644
--- a/generator/feature_maker.cpp
+++ b/generator/feature_maker.cpp
@@ -37,7 +37,6 @@ bool FeatureMakerSimple::BuildFromNode(OsmElement & p, FeatureParams const & par
 
 bool FeatureMakerSimple::BuildFromWay(OsmElement & p, FeatureParams const & params)
 {
-  auto const & cache = m_cache->GetCache();
   auto const & nodes = p.Nodes();
   if (nodes.size() < 2)
     return false;
@@ -46,7 +45,7 @@ bool FeatureMakerSimple::BuildFromWay(OsmElement & p, FeatureParams const & para
   m2::PointD pt;
   for (uint64_t ref : nodes)
   {
-    if (!cache->GetNode(ref, pt.y, pt.x))
+    if (!m_cache->GetNode(ref, pt.y, pt.x))
       return false;
 
     fb.AddPoint(pt);
@@ -56,8 +55,8 @@ bool FeatureMakerSimple::BuildFromWay(OsmElement & p, FeatureParams const & para
   fb.SetParams(params);
   if (fb.IsGeometryClosed())
   {
-    HolesProcessor processor(p.m_id, cache);
-    cache->ForEachRelationByWay(p.m_id, processor);
+    HolesProcessor processor(p.m_id, m_cache);
+    m_cache->ForEachRelationByWay(p.m_id, processor);
     fb.SetHoles(processor.GetHoles());
     fb.SetArea();
   }
@@ -72,8 +71,7 @@ bool FeatureMakerSimple::BuildFromWay(OsmElement & p, FeatureParams const & para
 
 bool FeatureMakerSimple::BuildFromRelation(OsmElement & p, FeatureParams const & params)
 {
-  auto const & cache = m_cache->GetCache();
-  HolesRelation helper(cache);
+  HolesRelation helper(m_cache);
   helper.Build(&p);
   auto const & holesGeometry = helper.GetHoles();
   auto & outer = helper.GetOuter();
diff --git a/generator/feature_maker.hpp b/generator/feature_maker.hpp
index 79c13b74d6..724bb8dc45 100644
--- a/generator/feature_maker.hpp
+++ b/generator/feature_maker.hpp
@@ -2,6 +2,7 @@
 
 #include "generator/feature_builder.hpp"
 #include "generator/feature_maker_base.hpp"
+#include "generator/intermediate_data.hpp"
 
 struct OsmElement;
 
diff --git a/generator/feature_maker_base.cpp b/generator/feature_maker_base.cpp
index d7a275cbee..a66b35b9b6 100644
--- a/generator/feature_maker_base.cpp
+++ b/generator/feature_maker_base.cpp
@@ -1,5 +1,6 @@
 #include "generator/feature_maker_base.hpp"
 
+#include "generator/intermediate_data.hpp"
 #include "generator/osm_element.hpp"
 
 #include "base/assert.hpp"
@@ -10,10 +11,10 @@ using namespace feature;
 
 namespace generator
 {
-FeatureMakerBase::FeatureMakerBase(std::shared_ptr<cache::IntermediateData> const & cache)
+FeatureMakerBase::FeatureMakerBase(std::shared_ptr<cache::IntermediateDataReader> const & cache)
   : m_cache(cache) {}
 
-void FeatureMakerBase::SetCache(std::shared_ptr<cache::IntermediateData> const & cache)
+void FeatureMakerBase::SetCache(std::shared_ptr<cache::IntermediateDataReader> const & cache)
 {
   m_cache = cache;
 }
diff --git a/generator/feature_maker_base.hpp b/generator/feature_maker_base.hpp
index 7b049e32ee..aae1ec1972 100644
--- a/generator/feature_maker_base.hpp
+++ b/generator/feature_maker_base.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "generator/feature_builder.hpp"
+#include "generator/intermediate_data.hpp"
 
 #include <queue>
 
@@ -8,23 +9,18 @@ struct OsmElement;
 
 namespace generator
 {
-namespace cache
-{
-class IntermediateData;
-}  // namespace cache
-
 // Abstract class FeatureMakerBase is responsible for the conversion OsmElement to FeatureBuilder.
 // The main task of this class is to create features of the necessary types.
 // At least one feature should turn out from one OSM element. You can get several features from one element.
 class FeatureMakerBase
 {
 public:
-  explicit FeatureMakerBase(std::shared_ptr<cache::IntermediateData> const & cache = {});
+  explicit FeatureMakerBase(std::shared_ptr<cache::IntermediateDataReader> const & cache = {});
   virtual ~FeatureMakerBase() = default;
 
   virtual std::shared_ptr<FeatureMakerBase> Clone() const = 0;
 
-  void SetCache(std::shared_ptr<cache::IntermediateData> const & cache);
+  void SetCache(std::shared_ptr<cache::IntermediateDataReader> const & cache);
 
   // Reference on element is non const because ftype::GetNameAndType will be call.
   virtual bool Add(OsmElement & element);
@@ -40,7 +36,7 @@ protected:
 
   virtual void ParseParams(FeatureParams & params, OsmElement & element) const  = 0;
 
-  std::shared_ptr<cache::IntermediateData> m_cache;
+  std::shared_ptr<cache::IntermediateDataReader> m_cache;
   std::queue<feature::FeatureBuilder> m_queue;
 };
 
diff --git a/generator/generator_tests/camera_collector_tests.cpp b/generator/generator_tests/camera_collector_tests.cpp
index 82d11dc6f6..faeccbd327 100644
--- a/generator/generator_tests/camera_collector_tests.cpp
+++ b/generator/generator_tests/camera_collector_tests.cpp
@@ -57,7 +57,7 @@ class TranslatorForTest : public Translator
 public:
   explicit TranslatorForTest(shared_ptr<FeatureProcessorInterface> const & processor,
                              shared_ptr<generator::cache::IntermediateData> const & cache)
-    : Translator(processor, cache, make_shared<FeatureMaker>(cache))
+    : Translator(processor, cache, make_shared<FeatureMaker>(cache->GetCache()))
   {
     SetFilter(make_shared<FilterPlanet>());
   }
diff --git a/generator/translator.cpp b/generator/translator.cpp
index 6693f50d9d..5533e5304d 100644
--- a/generator/translator.cpp
+++ b/generator/translator.cpp
@@ -22,7 +22,7 @@ Translator::Translator(std::shared_ptr<FeatureProcessorInterface> const & proces
   , m_processor(processor)
   , m_cache(cache)
 {
-  m_featureMaker->SetCache(cache);
+  m_featureMaker->SetCache(cache->GetCache());
 }
 
 Translator::Translator(std::shared_ptr<FeatureProcessorInterface> const & processor,
diff --git a/generator/translator_coastline.cpp b/generator/translator_coastline.cpp
index cb8a3b3156..716496bff7 100644
--- a/generator/translator_coastline.cpp
+++ b/generator/translator_coastline.cpp
@@ -42,7 +42,7 @@ public:
 TranslatorCoastline::TranslatorCoastline(
     std::shared_ptr<FeatureProcessorInterface> const & processor,
     std::shared_ptr<cache::IntermediateData> const & cache)
-  : Translator(processor, cache, std::make_shared<FeatureMaker>(cache))
+  : Translator(processor, cache, std::make_shared<FeatureMaker>(cache->GetCache()))
 {
   auto filters = std::make_shared<FilterCollection>();
   filters->Append(std::make_shared<FilterPlanet>());
diff --git a/generator/translator_complex.cpp b/generator/translator_complex.cpp
index 64cc02c103..3ff13eb6e8 100644
--- a/generator/translator_complex.cpp
+++ b/generator/translator_complex.cpp
@@ -20,7 +20,7 @@ namespace generator
 {
 TranslatorComplex::TranslatorComplex(std::shared_ptr<FeatureProcessorInterface> const & processor,
                                      std::shared_ptr<cache::IntermediateData> const & cache)
-  : Translator(processor, cache, std::make_shared<FeatureMaker>(cache))
+  : Translator(processor, cache, std::make_shared<FeatureMaker>(cache->GetCache()))
 {
   auto filters = std::make_shared<FilterCollection>();
   filters->Append(std::make_shared<FilterPlanet>());
diff --git a/generator/translator_country.cpp b/generator/translator_country.cpp
index de853a8e7e..5904f6ddf3 100644
--- a/generator/translator_country.cpp
+++ b/generator/translator_country.cpp
@@ -82,7 +82,7 @@ bool WikiDataValidator(std::string const & tagValue)
 TranslatorCountry::TranslatorCountry(std::shared_ptr<FeatureProcessorInterface> const & processor,
                                      std::shared_ptr<cache::IntermediateData> const & cache,
                                      feature::GenerateInfo const & info, bool needMixTags)
-  : Translator(processor, cache, std::make_shared<FeatureMaker>(cache))
+  : Translator(processor, cache, std::make_shared<FeatureMaker>(cache->GetCache()))
   , m_tagAdmixer(std::make_shared<TagAdmixer>(info.GetIntermediateFileName("ways", ".csv"),
                                               info.GetIntermediateFileName("towns", ".csv")))
   , m_tagReplacer(std::make_shared<TagReplacer>(
diff --git a/generator/translator_world.cpp b/generator/translator_world.cpp
index 69a1ecc89e..8178b8e8d0 100644
--- a/generator/translator_world.cpp
+++ b/generator/translator_world.cpp
@@ -25,7 +25,7 @@ namespace generator
 TranslatorWorld::TranslatorWorld(std::shared_ptr<FeatureProcessorInterface> const & processor,
                                  std::shared_ptr<cache::IntermediateData> const & cache,
                                  feature::GenerateInfo const & info, bool needMixTags)
-  : Translator(processor, cache, std::make_shared<FeatureMaker>(cache))
+  : Translator(processor, cache, std::make_shared<FeatureMaker>(cache->GetCache()))
   , m_tagAdmixer(std::make_shared<TagAdmixer>(info.GetIntermediateFileName("ways", ".csv"),
                                               info.GetIntermediateFileName("towns", ".csv")))
   , m_tagReplacer(std::make_shared<TagReplacer>(