Fix caching breaking the cached UUID accounts