More caching and fixed bad request