merged branch dsm into trunk
simplier cache management
codebase used to migrate to java8 the production system