BUG Fix issue with versioned dataobjects being cached between stages

This will need to be merged up to 3.1/master.  Please review @ss23 @hafriedlander :)