Fix Email parsing cache related bugs (issue #620)