Changed cahce method to Set instead of Add