added last-modifed and cache control, but still keeping cache "private"
Merge branch 'develop'