Added no-cache header for non-proxy resources
Fixed NPE