I noticed that we already had a bit of wrapping before your fix, so let me know if you want to create another issue to investigate moving the entry wrapping here to the EntryWrappingInterceptor.