Fixed some missed stuff to utilize resource repo.
Merge pull request #211 from xi-project/resource-not-updated-in-cache

Fixed some missed stuff to utilize resource repo.
Merge remote-tracking branch 'origin/master' into 0.12