Remove dependency to hibernate and cache plugin