Ticket #3341 Fix Cache - Unparsing issue in xml, and cleanup SameAs f(n)'s.