Fix CHI caching in list