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

This reverts commit 960717cf04b31727dc90958a8d35312778b5b619.