Admin caching
Merge pull request #1377 from byteGator/Admin-caching

Admin caching