Code

Merge branch 'rs/allocate-cache-entry-individually'