BREAKS BUILD: all pages etc are much faster, but categories functionality is broken (it was responsible for calling the renderer once per every page on All Pages)

app/models/page_set.rb

@@ -81,7 +81,9 @@ class PageSet < Array
   end
 
   def wiki_words
-    self.inject([]) { |wiki_words, page| WikiReference.wiki_words(page) }.flatten.uniq
+    self.inject([]) { |wiki_words, page|
+      wiki_words + page.wiki_references.map { |ref| ref.referenced_page_name }
+    }.flatten.uniq
   end
 
   def authors

app/models/web.rb

@@ -1,5 +1,5 @@
 class Web < ActiveRecord::Base
-  has_many :pages#, :include => [:current_revision, :web]
+  has_many :pages
 
   def wiki
     Wiki.new