added cache headers and small tweaks for responses