Rather than enabling cache or not we actually wanted to enable or disable the check for whether something was in the cache - so that we can repopulate the cache via a rake task or the like. This reverts the other commit and adds what we really wanted.