diff --git a/daemon/table/measurements.cpp b/daemon/table/measurements.cpp
index 6c19d10..a63c602 100644
--- a/daemon/table/measurements.cpp
+++ b/daemon/table/measurements.cpp
@@ -1,11 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014  Regents of the University of California,
- *                     Arizona Board of Regents,
- *                     Colorado State University,
- *                     University Pierre & Marie Curie, Sorbonne University,
- *                     Washington University in St. Louis,
- *                     Beijing Institute of Technology
+ * Copyright (c) 2014,  Regents of the University of California,
+ *                      Arizona Board of Regents,
+ *                      Colorado State University,
+ *                      University Pierre & Marie Curie, Sorbonne University,
+ *                      Washington University in St. Louis,
+ *                      Beijing Institute of Technology,
+ *                      The University of Memphis
  *
  * This file is part of NFD (Named Data Networking Forwarding Daemon).
  * See AUTHORS.md for complete list of NFD authors and contributors.
@@ -20,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License along with
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
- **/
+ */
 
 #include "measurements.hpp"
 #include "name-tree.hpp"
@@ -29,8 +30,6 @@
 
 namespace nfd {
 
-const time::nanoseconds Measurements::s_defaultLifetime = time::seconds(4);
-
 Measurements::Measurements(NameTree& nameTree)
   : m_nameTree(nameTree)
   , m_nItems(0)
@@ -53,9 +52,15 @@
   shared_ptr<measurements::Entry> entry = nameTreeEntry->getMeasurementsEntry();
   if (static_cast<bool>(entry))
     return entry;
+
   entry = make_shared<measurements::Entry>(nameTreeEntry->getPrefix());
   nameTreeEntry->setMeasurementsEntry(entry);
-  m_nItems++;
+  ++m_nItems;
+
+  entry->m_expiry = time::steady_clock::now() + getInitialLifetime();
+  entry->m_cleanup = scheduler::schedule(getInitialLifetime(),
+                                         bind(&Measurements::cleanup, this, entry));
+
   return entry;
 }
 
diff --git a/daemon/table/measurements.hpp b/daemon/table/measurements.hpp
index 4936d28..1ace0b9 100644
--- a/daemon/table/measurements.hpp
+++ b/daemon/table/measurements.hpp
@@ -1,11 +1,12 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014  Regents of the University of California,
- *                     Arizona Board of Regents,
- *                     Colorado State University,
- *                     University Pierre & Marie Curie, Sorbonne University,
- *                     Washington University in St. Louis,
- *                     Beijing Institute of Technology
+ * Copyright (c) 2014,  Regents of the University of California,
+ *                      Arizona Board of Regents,
+ *                      Colorado State University,
+ *                      University Pierre & Marie Curie, Sorbonne University,
+ *                      Washington University in St. Louis,
+ *                      Beijing Institute of Technology,
+ *                      The University of Memphis
  *
  * This file is part of NFD (Named Data Networking Forwarding Daemon).
  * See AUTHORS.md for complete list of NFD authors and contributors.
@@ -20,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License along with
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
- **/
+ */
 
 #ifndef NFD_DAEMON_TABLE_MEASUREMENTS_HPP
 #define NFD_DAEMON_TABLE_MEASUREMENTS_HPP
@@ -77,6 +78,9 @@
   shared_ptr<measurements::Entry>
   findExactMatch(const Name& name) const;
 
+  static time::nanoseconds
+  getInitialLifetime();
+
   /** extend lifetime of an entry
    *
    *  The entry will be kept until at least now()+lifetime.
@@ -100,6 +104,12 @@
   static const time::nanoseconds s_defaultLifetime;
 };
 
+inline time::nanoseconds
+Measurements::getInitialLifetime()
+{
+  return time::seconds(4);
+}
+
 inline size_t
 Measurements::size() const
 {