Disabled client-side caching for now .. it's causing problems;