Lps 36175

Fixed the deprecated warnings.

Note that the warnings for ModifiableEhcacheWrapper can't be addressed because of the interface provided by ehcache. Adding the typing creates compile-time errors.