Merge "Use cached pid uid from Session"