Asset caching fixes