Fixed caching to be down in the data layer

restructured site not to do caching everywhere