Fixes empty key caching issue.