Use session cache, closes #26