Fixed cache key bug
Merge branch 'fix_sites_cache_bug' into odata_consumer_v2