Updates to color and caching