Added better bootstrap and working on api caching