#73 Minor changes to facilitate caching experiments