CLC-3816 More cacheable test coverage, and fix nil read bug