Fixed namespaces
Removed older Cache file