Revise http caching implementation