Merge "Improve service template access through cache."