Fixed cache invalidation issue;
Merge pull request #9 from pbs/cache_invalidation

Fixed cache invalidation issue