Fixed remaining issues with Cached streams.