Change registration and instantiation of cache classes.
v1.1 release.