Played with caching because it wasn't working properly