Rework caching strategy & forms styling