Minor cleanup
Cloning proxy params instead of copying ref
Caching history