Added caching to Stream API