Runtime cache streams by id
Merge pull request #3052 from obrignoni/2.3/cache-stream-by-id

Runtime cache streams by id