Make the step in Cache.addAll always refer to the value of the right type