Split out CostModel part that obviously depends on storage. Add a factory controlled by a service to get right one.