Merge "Add caching to AM.getCurrentUserId()." into main