cache stream results
fix stream related stuff