Fixed zone caching issue