Clean up param stealing in cache module