Removed cache stuff.  Will re-add at a later date depending on how we choose to approach it