There is an acs-templating parameter that causes templates to not be cached. I think you should use that for the case of a master template being added. I don't think we'll want to look for master templates in 5 different places on every request, if we can avoid it.
