Fixed bug in caching, value lists were not in sync.