cache fixes, setup for deployment