caching fixes for dev stream