Rafactor ehCache to not create a new object each time a cache is requested
Separated types code
Separated types code