Cleaned up code.
Added InjectionCaching support.
Added related unit-tests to Caching classes.