Merge "[Test Week] Add unit tests for UserCache" into main