Move cache classes to own package.