DAR-959: changed cache to cacheWithLock