Update for caching issue, need to mark dirty vs clearing the cache.
Merge pull request #1044 from jeffreythomas/dev

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