Fixed issues in when to and when not to use self.sitetree_cache_key()
Merge branch 'feature/site-based-cache'