Try to fix caching/content-type bug