Merge "Updates to Caching"