latest cherry pick for cache features, conflict resolves