Merge "Convert UserCache to use Dagger" into main