HCOLL-25 last minor improvements in cache contention avoiding logic