Caching streams - WIP - currently broken