Some fixes dealing with cached contents. refs #514