Fix #24 cache problem