Caching error on js file solved. Also solved some issues with caching in general (hopefully)
Merge pull request #13 from wildewouter/feature/ISSUE12

Feature/issue03