[UPDATE] - Cache  json stream based