Request storage refactoring