Make whitelist caches independent of each other (untested code warning)