Improvements to URLStream (Proper caching still planned)