Cleaned up all of the cache code with the , operator.