Use state to manage stream invalidations instead of cache
Merge pull request #9748 from mmun/stream-state

Use state to manage stream invalidations instead of cache