Add UUID Caching