Improve UUID lookups a bit