Moved out cache providers to separate module