Revert "removed unused ContextProviderFactory & SimpleContextProvider"

This reverts commit 52c6769387339f45537d897052c66badf7cd20c4.