Removed caching for preview