Fix area caching (fixes #1485)