CAAERS-7046 - fixing stream caching issue.