Merge pull request #118 from allenxwang/2.x

Minor changes and optimization
Rename addCacheProvider to withCacheProvider and remove the list implementation.