Fixed bug in key-caching.
Merge remote-tracking branch 'origin/master'