Removed UUID logic and used just the siteid (as its supposed to be unique in and of itself).  Left caching in, will need to provide a maintenance service in the future for the cache.