Caching code changed. No duplicate data caching now :)