Merged object type and object dao into same file
Removed @Cache from all entities