fix issues in cdi
remove Generics of cache
Merge remote-tracking branch 'origin/dev' into erik