#38 caching fixed