Fix route-specific storage by adding another level of indirection