[Services: Integrate caching]

Added (missing) unit tests to test class level caching