Cache in VersionConstraint
Merge remote-tracking branch 'AlexeyKupershtokh/cache-version-constraint'
Rename a few things