Merge "Delete UIDGenerator cache files after unit tests"