Revert "Merge pull request #286 from rxin/cache"

This reverts commit bd9adfa2ad9d6aeabf7c822df5b1234e6267af66, reversing
changes made to 6f4e5c48def3bd8d0d0db9ff3285324da7bcee15.