Added the NoCache
Added ServiceDefinition caching