I think that I have already found all usage and refactored accordingly. The Enhancer SPI has a dependency on Javassist which I did now move. I already created a skeleton for Byte Buddy but I am still busy with the refactoring.

I already ported the map-proxy to Byte Buddy; for now I keep both implementations parallel. All I miss for now is the Enhancer.