Fixed client templat cache polluting when merging templates