Moved cache classes
Fixed namespaces
Fixed use