fix static caching and make the loader smoother