Fix #95 enabled in-memoery and disc cache