Fix UUID cache