Merge "Fix cache by userId bugs" into sc-dev