Fallow naming conventions
 #43 Fix compatibility issue with Spring 4.1 Cache