Atomic cache creation
Fix controller cache update