Cache improvement and 404 layout fix