better indentation and added tags array in cache