Code cleanup and implemented no-cache support.