Resolved caching issue