Changes due to problems with nginx caching