Still having caching issues