Clean up cache testing code, change method name,