diff --git a/indexer/index.cpp b/indexer/index.cpp
index 38b56ebfb1..378a3e3fc2 100644
--- a/indexer/index.cpp
+++ b/indexer/index.cpp
@@ -47,9 +47,9 @@ bool Index::GetVersion(string const & name, MwmInfo & info) const
   return true;
 }
 
-MwmValue * Index::CreateValue(string const & name) const
+shared_ptr<MwmSet::MwmValueBase> Index::CreateValue(string const & name) const
 {
-  MwmValue * p = new MwmValue(name);
+  shared_ptr<MwmValue> p(new MwmValue(name));
   ASSERT(p->GetHeader().IsMWMSuitable(), ());
   return p;
 }
diff --git a/indexer/index.hpp b/indexer/index.hpp
index d776ab09e9..d25ec1fef7 100644
--- a/indexer/index.hpp
+++ b/indexer/index.hpp
@@ -38,7 +38,7 @@ class Index : public MwmSet
 protected:
   // MwmSet overrides:
   bool GetVersion(string const & name, MwmInfo & info) const override;
-  MwmValue * CreateValue(string const & name) const override;
+  shared_ptr<MwmValueBase> CreateValue(string const & name) const override;
   void UpdateMwmInfo(MwmId id) override;
 
 public:
diff --git a/indexer/indexer_tests/mwm_set_test.cpp b/indexer/indexer_tests/mwm_set_test.cpp
index c93da15009..0135342084 100644
--- a/indexer/indexer_tests/mwm_set_test.cpp
+++ b/indexer/indexer_tests/mwm_set_test.cpp
@@ -22,7 +22,10 @@ namespace
       return true;
     }
 
-    MwmValue * CreateValue(string const &) const override { return new MwmValue(); }
+    shared_ptr<MwmValueBase> CreateValue(string const &) const override
+    {
+      return shared_ptr<MwmValueBase>(new MwmValue());
+    }
 
   public:
     ~TestMwmSet()
diff --git a/indexer/mwm_set.cpp b/indexer/mwm_set.cpp
index c41a961b12..f4efd1c83f 100644
--- a/indexer/mwm_set.cpp
+++ b/indexer/mwm_set.cpp
@@ -42,17 +42,15 @@ MwmSet::MwmLock::MwmLock(MwmSet & mwmSet, string const & fileName)
     m_value = m_mwmSet->LockValueImpl(m_mwmId);
 }
 
-MwmSet::MwmLock::MwmLock(MwmSet & mwmSet, MwmId mwmId, MwmValueBase * value)
+MwmSet::MwmLock::MwmLock(MwmSet & mwmSet, MwmId mwmId, shared_ptr<MwmValueBase> value)
     : m_mwmSet(&mwmSet), m_mwmId(mwmId), m_value(value)
 {
 }
 
 MwmSet::MwmLock::MwmLock(MwmLock && lock)
-    : m_mwmSet(lock.m_mwmSet), m_mwmId(lock.m_mwmId), m_value(lock.m_value)
+    : m_mwmSet(lock.m_mwmSet), m_mwmId(lock.m_mwmId), m_value(move(lock.m_value))
 {
-  lock.m_mwmId = 0;
   lock.m_mwmId = MwmSet::INVALID_MWM_ID;
-  lock.m_value = 0;
 }
 
 MwmSet::MwmLock::~MwmLock()
@@ -245,17 +243,17 @@ MwmInfo const & MwmSet::GetMwmInfo(MwmId id) const
   return m_info[id];
 }
 
-MwmSet::MwmValueBase * MwmSet::LockValue(MwmId id)
+shared_ptr<MwmSet::MwmValueBase> MwmSet::LockValue(MwmId id)
 {
   lock_guard<mutex> lock(m_lock);
   return LockValueImpl(id);
 }
 
-MwmSet::MwmValueBase * MwmSet::LockValueImpl(MwmId id)
+shared_ptr<MwmSet::MwmValueBase> MwmSet::LockValueImpl(MwmId id)
 {
   ASSERT_LESS(id, m_info.size(), ());
   if (id >= m_info.size())
-    return nullptr;
+    return shared_ptr<MwmValueBase>();
 
   UpdateMwmInfo(id);
   if (!m_info[id].IsUpToDate())
@@ -268,7 +266,7 @@ MwmSet::MwmValueBase * MwmSet::LockValueImpl(MwmId id)
   {
     if (it->first == id)
     {
-      MwmValueBase * result = it->second;
+      shared_ptr<MwmValueBase> result = it->second;
       m_cache.erase(it);
       return result;
     }
@@ -276,17 +274,17 @@ MwmSet::MwmValueBase * MwmSet::LockValueImpl(MwmId id)
   return CreateValue(m_info[id].m_fileName);
 }
 
-void MwmSet::UnlockValue(MwmId id, MwmValueBase * p)
+void MwmSet::UnlockValue(MwmId id, shared_ptr<MwmValueBase> p)
 {
   lock_guard<mutex> lock(m_lock);
   UnlockValueImpl(id, p);
 }
 
-void MwmSet::UnlockValueImpl(MwmId id, MwmValueBase * p)
+void MwmSet::UnlockValueImpl(MwmId id, shared_ptr<MwmValueBase> p)
 {
   ASSERT(p, (id));
   ASSERT_LESS(id, m_info.size(), ());
-  if (id >= m_info.size() || p == 0)
+  if (id >= m_info.size() || !p.get())
     return;
 
   ASSERT_GREATER(m_info[id].m_lockCount, 0, ());
@@ -300,12 +298,9 @@ void MwmSet::UnlockValueImpl(MwmId id, MwmValueBase * p)
     if (m_cache.size() > m_cacheSize)
     {
       ASSERT_EQUAL(m_cache.size(), m_cacheSize + 1, ());
-      delete m_cache.front().second;
       m_cache.pop_front();
     }
   }
-  else
-    delete p;
 }
 
 void MwmSet::ClearCache()
@@ -317,8 +312,6 @@ void MwmSet::ClearCache()
 
 void MwmSet::ClearCacheImpl(CacheType::iterator beg, CacheType::iterator end)
 {
-  for (CacheType::iterator it = beg; it != end; ++it)
-    delete it->second;
   m_cache.erase(beg, end);
 }
 
@@ -327,10 +320,12 @@ namespace
   struct MwmIdIsEqualTo
   {
     MwmSet::MwmId m_id;
+
     explicit MwmIdIsEqualTo(MwmSet::MwmId id) : m_id(id) {}
-    bool operator() (pair<MwmSet::MwmId, MwmSet::MwmValueBase *> const & p) const
+
+    bool operator()(pair<MwmSet::MwmId, shared_ptr<MwmSet::MwmValueBase>> const & p) const
     {
-      return (p.first == m_id);
+      return p.first == m_id;
     }
   };
 }
diff --git a/indexer/mwm_set.hpp b/indexer/mwm_set.hpp
index 52cf1fc93f..27823ae8f9 100644
--- a/indexer/mwm_set.hpp
+++ b/indexer/mwm_set.hpp
@@ -8,6 +8,7 @@
 
 #include "std/deque.hpp"
 #include "std/mutex.hpp"
+#include "std/shared_ptr.hpp"
 #include "std/string.hpp"
 #include "std/utility.hpp"
 #include "std/vector.hpp"
@@ -83,12 +84,13 @@ public:
     MwmLock(MwmLock && lock);
     virtual ~MwmLock();
 
+    // Returns a non-owning ptr.
     template <typename T>
     inline T * GetValue() const
     {
-      return static_cast<T *>(m_value);
+      return static_cast<T *>(m_value.get());
     }
-    inline bool IsLocked() const { return m_value; }
+    inline bool IsLocked() const { return m_value.get() != nullptr; }
     inline MwmId GetId() const { return m_mwmId; }
     MwmInfo const & GetInfo() const;
 
@@ -97,11 +99,11 @@ public:
   private:
     friend class MwmSet;
 
-    MwmLock(MwmSet & mwmSet, MwmId mwmId, MwmValueBase * value);
+    MwmLock(MwmSet & mwmSet, MwmId mwmId, shared_ptr<MwmValueBase> value);
 
     MwmSet * m_mwmSet;
     MwmId m_mwmId;
-    MwmValueBase * m_value;
+    shared_ptr<MwmValueBase> m_value;
 
     NONCOPYABLE(MwmLock);
   };
@@ -159,17 +161,17 @@ protected:
   /// @return True when it's possible to get file format version - in
   ///         this case version is set to the file format version.
   virtual bool GetVersion(string const & name, MwmInfo & info) const = 0;
-  virtual MwmValueBase * CreateValue(string const & name) const = 0;
+  virtual shared_ptr<MwmValueBase> CreateValue(string const & name) const = 0;
 
   void Cleanup();
 
 private:
-  typedef deque<pair<MwmId, MwmValueBase *> > CacheType;
+  typedef deque<pair<MwmId, shared_ptr<MwmValueBase>>> CacheType;
 
-  MwmValueBase * LockValue(MwmId id);
-  MwmValueBase * LockValueImpl(MwmId id);
-  void UnlockValue(MwmId id, MwmValueBase * p);
-  void UnlockValueImpl(MwmId id, MwmValueBase * p);
+  shared_ptr<MwmValueBase> LockValue(MwmId id);
+  shared_ptr<MwmValueBase> LockValueImpl(MwmId id);
+  void UnlockValue(MwmId id, shared_ptr<MwmValueBase> p);
+  void UnlockValueImpl(MwmId id, shared_ptr<MwmValueBase> p);
 
   /// Find first removed mwm or add a new one.
   /// @precondition This function is always called under mutex m_lock.