Merge "Update structure and value cache when refreshing variable"