#73 Avoid race condition with marker callback error handling
#73 Minor changes to facilitate caching experiments