The yaml mapper is mostly not needed and can be avoided entirely with logic similar to what is done for parsing. This will also remove the need for the method to clear the mapper.