The only change that is going to help WFLY-2387, would be to lazily wait to register the entity listener class until first time use (after deployment).