Doc, cache bug & Code refactoring