Updated to get issue caching working and uniform