fix cache file reconstitution when default watermark set and cached image does not want watermark

#809