small fixes
Cached query new stream / connection fix