#382 caching changes