Remove caff.de generics (poor performance) in favor of WeakValueHashMap
from jboss athough it does not support generics.
Merge remote-tracking branch 'origin/master'