UniqueId refactoring
Merge pull request #43 from ya-popeye/feature/UniqueId_refactoring

Merge uniqueId caches into one.