Merge "Introduce user cache and resolve cross-profile access correctly." into sc-dev