Implement cache persistence
fix merge conflict
fix mispselling.