Fix streams during topology changes

The initial implementation of scattered cache has some known problems in streams. In order to reduce effort for keeping the rest of the features in sync ISPN-6645 will be integrated even with these problems and this JIRA should track the outstanding issues.