Merge pull request #666 from bhariharan/smart_sync

Adding cache manager implementation