added cache for sreamed instances
added fix to stream detection in options