Merge "Use adapter position for cache invalidation" into mnc-ub-dev