refactor proxy interceptor