CLC-3696 Even more cacheable test coverage