diff --git a/realms/modules/search/commands.py b/realms/modules/search/commands.py
index 43507df..c11edb8 100644
--- a/realms/modules/search/commands.py
+++ b/realms/modules/search/commands.py
@@ -30,10 +30,12 @@ def rebuild_index():
                 continue
             name = filename_to_cname(page['path'])
             # TODO add email?
+            # TODO I have concens about indexing the commit info from latest revision, see #148
+            info = next(page.history)
             body = dict(name=name,
                         content=page.data,
-                        message=page.info['message'],
-                        username=page.info['author'],
+                        message=info['message'],
+                        username=info['author'],
                         updated_on=entry['mtime'],
                         created_on=entry['ctime'])
             search.index_wiki(name, body)
diff --git a/realms/modules/wiki/models.py b/realms/modules/wiki/models.py
index a73dbaa..aa276a3 100644
--- a/realms/modules/wiki/models.py
+++ b/realms/modules/wiki/models.py
@@ -89,17 +89,6 @@ class WikiPage(object):
         cache.set(cache_key, data)
         return data
 
-    @property
-    def info(self):
-        cache_key = self._cache_key('info')
-        cached = cache.get(cache_key)
-        if cached:
-            return cached
-
-        info = next(self.history)
-        cache.set(cache_key, info)
-        return info
-
     @property
     def history(self):
         """Get page history.
diff --git a/realms/modules/wiki/tests.py b/realms/modules/wiki/tests.py
index 4e9c8eb..565f4f1 100644
--- a/realms/modules/wiki/tests.py
+++ b/realms/modules/wiki/tests.py
@@ -41,7 +41,7 @@ class WikiTest(WikiBaseTest):
         self.assert_200(rv)
 
         self.assert_context('name', 'test')
-        eq_(self.get_context_variable('page').info['message'], 'test message')
+        eq_(next(self.get_context_variable('page').history)['message'], 'test message')
         eq_(self.get_context_variable('page').data, 'testing')
 
     def test_history(self):
diff --git a/realms/modules/wiki/views.py b/realms/modules/wiki/views.py
index a50df83..f7c474b 100644
--- a/realms/modules/wiki/views.py
+++ b/realms/modules/wiki/views.py
@@ -96,7 +96,8 @@ def edit(name):
     return render_template('wiki/edit.html',
                            name=cname,
                            content=page.data,
-                           info=page.info,
+                           # TODO: Remove this? See #148
+                           info=next(page.history),
                            sha=page.sha,
                            partials=page.partials)