Bugfixes & improvements around comm protocol and stream caching