diff --git a/routing/geometry.cpp b/routing/geometry.cpp
index cc9f125ece..e6116d1434 100644
--- a/routing/geometry.cpp
+++ b/routing/geometry.cpp
@@ -160,8 +160,7 @@ void FileGeometryLoader::Load(uint32_t featureId, RoadGeometry & road)
 }
 
 // RoadGeometry ------------------------------------------------------------------------------------
-RoadGeometry::RoadGeometry(bool oneWay, double weightSpeedKMpH, double etaSpeedKMpH,
-                           Points const & points)
+RoadGeometry::RoadGeometry(bool oneWay, double weightSpeedKMpH, double etaSpeedKMpH, Points const & points)
   : m_forwardSpeed{weightSpeedKMpH, etaSpeedKMpH}, m_backwardSpeed(m_forwardSpeed)
   , m_isOneWay(oneWay), m_valid(true), m_isPassThroughAllowed(false), m_inCity(false)
 {
@@ -256,11 +255,13 @@ double RoadGeometry::GetRoadLengthM() const
 // Geometry ----------------------------------------------------------------------------------------
 Geometry::Geometry(unique_ptr<GeometryLoader> loader, size_t roadsCacheSize)
   : m_loader(move(loader))
-  , m_featureIdToRoad(make_unique<RoutingFifoCache>(
-        roadsCacheSize,
-        [this](uint32_t featureId, RoadGeometry & road) { m_loader->Load(featureId, road); }))
 {
   CHECK(m_loader, ());
+
+  m_featureIdToRoad = make_unique<RoutingCacheT>(roadsCacheSize, [this](uint32_t featureId, RoadGeometry & road)
+  {
+    m_loader->Load(featureId, road);
+  });
 }
 
 RoadGeometry const & Geometry::GetRoad(uint32_t featureId)
diff --git a/routing/geometry.hpp b/routing/geometry.hpp
index 8be9c00904..46b354f032 100644
--- a/routing/geometry.hpp
+++ b/routing/geometry.hpp
@@ -33,10 +33,10 @@ class RoadAttrsGetter;
 class RoadGeometry final
 {
 public:
-  using Points = buffer_vector<m2::PointD, 32>;
-
   RoadGeometry() : m_isOneWay(false), m_valid(false), m_isPassThroughAllowed(false), m_inCity(false) {}
+
   /// Used in tests.
+  using Points = std::vector<m2::PointD>;
   RoadGeometry(bool oneWay, double weightSpeedKMpH, double etaSpeedKMpH, Points const & points);
 
   /// @param[in] altitudes May be nullptr.
@@ -86,7 +86,7 @@ public:
   double GetRoadLengthM() const;
 
 private:
-  buffer_vector<LatLonWithAltitude, 32> m_junctions;
+  std::vector<LatLonWithAltitude> m_junctions;
 
   SpeedKMpH m_forwardSpeed;
   SpeedKMpH m_backwardSpeed;
@@ -147,10 +147,10 @@ public:
   }
 
 private:
-  using RoutingFifoCache =
-      FifoCache<uint32_t, RoadGeometry, ska::bytell_hash_map<uint32_t, RoadGeometry>>;
+  /// @todo Use LRU cache?
+  using RoutingCacheT = FifoCache<uint32_t, RoadGeometry, ska::bytell_hash_map<uint32_t, RoadGeometry>>;
 
   std::unique_ptr<GeometryLoader> m_loader;
-  std::unique_ptr<RoutingFifoCache> m_featureIdToRoad;
+  std::unique_ptr<RoutingCacheT> m_featureIdToRoad;
 };
 }  // namespace routing