Cleaned and added aditional cache tests