Update for caching issue, need to mark dirty vs clearing the cache.