Improve code organization.
Add Cache annotation (bridge with responses).