#149 Caching breaks on concurrent access