PLFM-1672 Fix NPE
PLFM-1670 Fix a bug that the cache refresh is never scheduled
Merge pull request #271 from eric-wu/release-1.16

Patch Release 1.16 for PLFM-1670, PLFM-1672