Merge conflicts resolved
Added ArrayCache support for arbitary value based caching.
Formatted code using brackets beautify plugin.
Added delims for ArrayCache on back and away for query.room.threads