make timestamps part of context for persistency, fix for #234