making sure cache can't be null
adding cleaner logging and new option to disable domain based alignments
Merge remote-tracking branch 'upstream/master'