Untie request from container and some proxy refactoring