updated to core cache control, small bugfixes