Wrap Set and cache specification.
Rename and adapt spec.