Correct errors introduced in 4f5536dcfc124511987d2e4d9ffcd4005e99193d

This branch fixes errors introduced in 4f5536dcfc124511987d2e4d9ffcd4005e99193d that broke caching for the service.