Added option to disable affinity cache
Merge pull request #33 from timf/2013.02

Added option to disable affinity cache