Added javascript concatenation and cache