Merge "Fix caching interface according to vendor feedback."