Remove dependency on aop:scoped-proxy