Changed naming of classes again
Adapt caching to the new naming for interfaces