Refactoring Spray support to avoid timing issue in initialization.