In-Memory Storage refactored out of router and task