Feature/cache and xstream #506

Closed ghost closed 3 years ago