Updated color caching issues