Revert "Merge pull request #457 from metamx/stream-cache"

This reverts commit 5fae4d9abcacb44df8b0cd2f999987cff37a0aef, reversing
changes made to 43a0554179f7d514b2e417e8045134656ab28e06.