--- a/mercurial/localrepo.py	Thu Jan 07 20:02:47 2016 -0800
+++ b/mercurial/localrepo.py	Wed Nov 11 21:18:02 2015 -0500
@@ -459,13 +459,13 @@
             pass
         return proxycls(self, name)
 
-    @repofilecache('bookmarks')
+    @repofilecache('bookmarks', 'bookmarks.current')
     def _bookmarks(self):
         return bookmarks.bmstore(self)
 
-    @repofilecache('bookmarks.current')
+    @property
     def _activebookmark(self):
-        return bookmarks.readactive(self)
+        return self._bookmarks.active
 
     def bookmarkheads(self, bookmark):
         name = bookmark.split('@', 1)[0]