diff -r 1767723f71cf -r 3c8811efdddc mercurial/localrepo.py
--- a/mercurial/localrepo.py	Tue Oct 18 17:32:51 2016 -0700
+++ b/mercurial/localrepo.py	Tue Oct 18 17:33:39 2016 -0700
@@ -504,9 +504,9 @@
                 c.readpending('00changelog.i.a')
         return c
 
-    @storecache('00manifest.i')
+    @property
     def manifest(self):
-        return self._constructmanifest()
+        return self.manifestlog._oldmanifest
 
     def _constructmanifest(self):
         # This is a temporary function while we migrate from manifest to
@@ -514,7 +514,7 @@
         # manifest creation.
         return manifest.manifest(self.svfs)
 
-    @property
+    @storecache('00manifest.i')
     def manifestlog(self):
         return manifest.manifestlog(self.svfs, self)