Modify other commands to use uid cache