Moved cache types to new file
Removed deprecated entity dsl retrievers