Updating final changes to cache invalidation. Public jira: CARBON-14757