Merge pull request #383 from totten/revert-cache