增加cache机制
代码调整
Merge branch '1.3a'