Store the wrappers with string keys
Add deprecation to CHANGELOG