ISPN-4559 Replace fails with cache loader

https://issues.jboss.org/browse/ISPN-4559
https://issues.jboss.org/browse/ISPN-4649
`putAndActivate` only activates the entry if it doesn't exist in the data container, shouldn't `removeAndActivate` do the same?