Make sure charm is cached under service name

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>