Fixed runtime cache provider issues & unit tests.